夏文涛 hace 2 años
padre
commit
cfd46be8ac

+ 90 - 63
.idea/workspace.xml

@@ -2,8 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6c5cf517-721b-44b7-afae-e7b1b913b988" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSexStatu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSexStatu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -19,31 +20,28 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="281">
-              <caret line="736" column="8" selection-start-line="736" selection-start-column="8" selection-end-line="736" selection-end-column="8" />
+            <state relative-caret-position="210">
+              <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="193">
-              <caret line="417" column="69" selection-start-line="417" selection-start-column="69" selection-end-line="417" selection-end-column="69" />
+            <state relative-caret-position="264">
+              <caret line="51" column="38" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/aop/DESResponseSecretAspect.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSexStatu.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="489">
-              <caret line="86" selection-start-line="86" selection-end-line="86" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="575">
+              <caret line="44" column="24" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" />
             </state>
           </provider>
         </entry>
@@ -59,11 +57,7 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>SeewoUpdateTeacher</find>
-      <find>stafft</find>
-      <find>bsInsertTeacher</find>
       <find>departmentNo</find>
-      <find>导入</find>
       <find>updateSmartUserById</find>
       <find>oldSchoolClass</find>
       <find>getTeacherScoreList</find>
@@ -87,8 +81,12 @@
       <find>repairAdminService</find>
       <find>public CommonResult</find>
       <find>update</find>
-      <find>importSmartScoreExcel</find>
       <find>rowNum</find>
+      <find>从0开始统计数量 所以得+1</find>
+      <find>importSmartScoreExcel</find>
+      <find>导入</find>
+      <find>headImage</find>
+      <find>百胜新增</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -101,8 +99,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/HomePageAttendanceVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eAttendanceStatu.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/annotation/DESRespondSecret.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/EncryptUtil.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/aop/DESResponseSecretAspect.java" />
@@ -121,7 +117,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmsCodeController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartWarningController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScreenshotRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScreenshotController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSchoolController.java" />
@@ -152,6 +147,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorityController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSexStatu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" />
       </list>
     </option>
   </component>
@@ -184,7 +182,7 @@
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
-    <option name="width" value="958" />
+    <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectView">
@@ -277,6 +275,35 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
+              <item name="backend_code" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="template" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="enumModel" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
+              <item name="backend_code" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="template" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="pojo" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
+              <item name="backend_code" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="services" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -400,18 +427,18 @@
       <option name="presentableId" value="Default" />
       <updated>1707008840183</updated>
       <workItem from="1707008843054" duration="16121000" />
-      <workItem from="1708481187426" duration="56617000" />
+      <workItem from="1708481187426" duration="61513000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="72738000" />
+    <option name="totallyTimeSpent" value="77634000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.0826226" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.37260127" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -423,7 +450,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.3358862" />
-      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.32603937" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3129103" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -440,7 +467,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.6336303" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.85412025" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" />
@@ -458,19 +485,19 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1410</line>
+          <line>1420</line>
           <properties />
           <option name="timeStamp" value="8" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>2090</line>
+          <line>2100</line>
           <properties />
           <option name="timeStamp" value="14" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1496</line>
+          <line>1506</line>
           <properties />
           <option name="timeStamp" value="15" />
         </line-breakpoint>
@@ -482,13 +509,13 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1152</line>
+          <line>1162</line>
           <properties />
           <option name="timeStamp" value="17" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1352</line>
+          <line>1362</line>
           <properties />
           <option name="timeStamp" value="18" />
         </line-breakpoint>
@@ -520,27 +547,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/HikvisionController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WxGzhController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="23">
-          <caret line="138" column="24" selection-start-line="138" selection-start-column="24" selection-end-line="138" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="467">
-          <caret line="295" column="27" selection-start-line="295" selection-start-column="27" selection-end-line="295" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/UploadController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="147">
@@ -858,13 +864,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="1152" column="40" lean-forward="true" selection-start-line="1152" selection-start-column="40" selection-end-line="1152" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="281">
@@ -884,8 +883,36 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="417" column="69" selection-start-line="417" selection-start-column="69" selection-end-line="417" selection-end-column="69" />
+        <state relative-caret-position="170">
+          <caret line="422" column="34" lean-forward="true" selection-start-line="422" selection-start-column="34" selection-end-line="422" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eIdentityStatu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSexStatu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="575">
+          <caret line="44" column="24" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="51" column="38" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
         </state>
       </provider>
     </entry>

+ 19 - 9
src/main/java/com/template/controller/SmartUserController.java

@@ -173,7 +173,7 @@ public class SmartUserController implements SmartUserControllerAPI {
 
         List<String> uploadImages = Arrays.asList(headImage.split(","));
         for (SmartUser user : result) {
-            Optional<String> image = uploadImages == null ? null : uploadImages.stream().filter(e -> e.equals("https://wanzai-1306339220.cos.ap-shanghai.myqcloud.com/headImage/" + user.getHeadImage())).findFirst();
+            Optional<String> image = uploadImages == null ? null : uploadImages.stream().filter(e -> e.equals("https://wanzai-1306339220.cos.ap-shanghai.myqcloud.com/" + user.getHeadImage())).findFirst();
             if (image != null && image.isPresent()) {
                 user.setHeadImage(image.get());
             }
@@ -362,7 +362,7 @@ public class SmartUserController implements SmartUserControllerAPI {
             }
             if (parents != null && parents.size() > 0) {
                 //批量存储家长信息
-                boolean resultBool = smartUserService.saveBatch(result);
+                boolean resultBool = smartUserService.saveBatch(parents);
                 if (!resultBool) {
                     return CommonResult.fail("导入失败!");
                 }
@@ -599,7 +599,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         }
 
                         //民族是否为空判断
-                        String nation = dataFormatter.formatCellValue(row.getCell(14));
+                        String nation = dataFormatter.formatCellValue(row.getCell(4));
                         if (ObjectUtils.isEmpty(nation)) {
                             return CommonResult.fail(name + "的民族不能为空");
                         }
@@ -642,12 +642,12 @@ public class SmartUserController implements SmartUserControllerAPI {
                         user.setHeadImage(cellImage);
                         user.setDormitoryNumber("");
                         String grade = schoolClass == null ? "" : schoolClass.substring(0, 3);
-                        user.setGrade(grade);
                         Optional<SmartGrade> oGrade = grades.stream().filter(e -> e.getName().equals(grade)).findFirst();
                         if (oGrade != null && oGrade.isPresent()) {
                             Integer gradeId = oGrade.get().getId();
+                            user.setGrade(String.valueOf(gradeId));
                             String schoolClassStr = schoolClass.replace("grade", "");
-                            Optional<SmartClass> oClass = classs.stream().filter(e -> e.getName().equals(schoolClassStr) && e.getGradeId().equals(gradeId)).findFirst();
+                            Optional<SmartClass> oClass = classs.stream().filter(e -> (grade+e.getName()).equals(schoolClassStr) && e.getGradeId().equals(gradeId)).findFirst();
                             if (oClass != null && oClass.isPresent()) {
                                 user.setSchoolClass(oClass.get().getId());
                             } else {
@@ -679,6 +679,8 @@ public class SmartUserController implements SmartUserControllerAPI {
                         familyOne.setName(family);
                         familyOne.setPhone(phone);
                         familyOne.setIdentityId(eIdentityStatu.Parent.getValue());
+                        familyOne.setSexId(eSexStatu.Man.getValue());
+                        familyOne.setIsCancel(eLogOff.Unlogout.getValue());
                         familyOne.setAffiliate(user.getCardNo());
                         String familyShip = dataFormatter.formatCellValue(row.getCell(11));//家属与本人关系
                         familyOne.setShip(familyShip == null ? "" : familyShip);
@@ -691,7 +693,9 @@ public class SmartUserController implements SmartUserControllerAPI {
                             String phoneTwo = dataFormatter.formatCellValue(row.getCell(12));//联系电话2
                             familyTwo.setPhone(phoneTwo == null ? "" : phoneTwo);
                             familyTwo.setIdentityId(eIdentityStatu.Parent.getValue());
-                            familyOne.setAffiliate(user.getCardNo());
+                            familyTwo.setSexId(eSexStatu.Man.getValue());
+                            familyTwo.setIsCancel(eLogOff.Unlogout.getValue());
+                            familyTwo.setAffiliate(user.getCardNo());
                             String familyShipTwo = dataFormatter.formatCellValue(row.getCell(14));//家属与本人关系2
                             familyTwo.setShip(familyShipTwo == null ? "" : familyShipTwo);
                             result.add(familyTwo);
@@ -841,7 +845,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         }
 
                         //民族是否为空判断
-                        String nation = dataFormatter.formatCellValue(row.getCell(14));
+                        String nation = dataFormatter.formatCellValue(row.getCell(4));
                         if (ObjectUtils.isEmpty(nation)) {
                             return CommonResult.fail(name + "的民族不能为空");
                         }
@@ -884,12 +888,12 @@ public class SmartUserController implements SmartUserControllerAPI {
                         user.setHeadImage(cellImage);
                         user.setDormitoryNumber("");
                         String grade = schoolClass == null ? "" : schoolClass.substring(0, 3);
-                        user.setGrade(grade);
                         Optional<SmartGrade> oGrade = grades.stream().filter(e -> e.getName().equals(grade)).findFirst();
                         if (oGrade != null && oGrade.isPresent()) {
                             Integer gradeId = oGrade.get().getId();
+                            user.setGrade(String.valueOf(gradeId));
                             String schoolClassStr = schoolClass.replace("grade", "");
-                            Optional<SmartClass> oClass = classs.stream().filter(e -> e.getName().equals(schoolClassStr) && e.getGradeId().equals(gradeId)).findFirst();
+                            Optional<SmartClass> oClass = classs.stream().filter(e -> (grade+e.getName()).equals(schoolClassStr) && e.getGradeId().equals(gradeId)).findFirst();
                             if (oClass != null && oClass.isPresent()) {
                                 user.setSchoolClass(oClass.get().getId());
                             } else {
@@ -921,6 +925,9 @@ public class SmartUserController implements SmartUserControllerAPI {
                         familyOne.setName(family);
                         familyOne.setPhone(phone);
                         familyOne.setIdentityId(eIdentityStatu.Parent.getValue());
+                        familyOne.setAffiliate(user.getCardNo());
+                        familyOne.setSexId(eSexStatu.Man.getValue());
+                        familyOne.setIsCancel(eLogOff.Unlogout.getValue());
                         String familyShip = dataFormatter.formatCellValue(row.getCell(11));//家属与本人关系
                         familyOne.setShip(familyShip == null ? "" : familyShip);
                         result.add(familyOne);
@@ -932,6 +939,9 @@ public class SmartUserController implements SmartUserControllerAPI {
                             String phoneTwo = dataFormatter.formatCellValue(row.getCell(12));//联系电话2
                             familyTwo.setPhone(phoneTwo == null ? "" : phoneTwo);
                             familyTwo.setIdentityId(eIdentityStatu.Parent.getValue());
+                            familyTwo.setSexId(eSexStatu.Man.getValue());
+                            familyTwo.setIsCancel(eLogOff.Unlogout.getValue());
+                            familyTwo.setAffiliate(user.getCardNo());
                             String familyShipTwo = dataFormatter.formatCellValue(row.getCell(14));//家属与本人关系2
                             familyTwo.setShip(familyShipTwo == null ? "" : familyShipTwo);
                             result.add(familyTwo);

+ 4 - 4
src/main/java/com/template/model/enumModel/eSexStatu.java

@@ -7,7 +7,7 @@ package com.template.model.enumModel;
  * @Version: 1.0
  */
 public enum eSexStatu {
-    Woman(0),//女
+    Woman(2),//女
     Man(1);//男
 
     private int value;
@@ -21,7 +21,7 @@ public enum eSexStatu {
     }
     public static eSexStatu valueOf(int value) {
         switch (value) {
-            case 0:
+            case 2:
                 return eSexStatu.Woman;
             case 1:
                 return eSexStatu.Man;
@@ -31,7 +31,7 @@ public enum eSexStatu {
     }
     public static String stringOf(Integer value) {
         switch (value) {
-            case 0:
+            case 2:
                 return "女";
             case 1:
                 return "男";
@@ -42,7 +42,7 @@ public enum eSexStatu {
     public static Integer integerOf(String value) {
         switch (value) {
             case "女":
-                return 0;
+                return 2;
             case "男":
                 return 1;
             default:

+ 1 - 1
src/main/java/com/template/model/pojo/SmartUser.java

@@ -49,7 +49,7 @@ public class SmartUser implements Serializable {
     @ApiModelProperty(value = "身份证号")
     private String idCard;
 
-    @ApiModelProperty(value = "性别  女:0   男:1")
+    @ApiModelProperty(value = "性别  女:2   男:1")
     private Integer sexId;
 
     @ApiModelProperty(value = "部门ID")

BIN
target/mybatis_plus-0.0.1-SNAPSHOT.jar.original