1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/UserController.java

@@ -166,12 +166,12 @@ public class UserController {
      * departmentCascade 部门层叠关系字符串 默认"0"
      */
     @RequestMapping("/insertUser")
-    public HttpRespMsg insertUser(String id, @RequestParam String name, String phone,
+    public HttpRespMsg insertUser(String id, @RequestParam String name,String gender, String phone,
                                   @RequestParam Integer roleId,@RequestParam Integer workTypeId, Double monthCost, Double cost,
                                   Integer departmentId, Integer salaryType, String costApplyDate,
                                     String position, String certJson,String inductionDate,String superiorId,
                                     String plate1,String plate2,String plate3,String plate4,String plate5, String jobNumber, String inactiveDate) {
-        return userService.insertUser(id, name, phone, roleId, workTypeId, monthCost, cost, departmentId, salaryType, costApplyDate,
+        return userService.insertUser(id, name,gender, phone, roleId, workTypeId, monthCost, cost, departmentId, salaryType, costApplyDate,
                     position, certJson, request,inductionDate,superiorId,plate1, plate2, plate3,plate4,plate5, jobNumber, inactiveDate);
     }
 

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/UserService.java

@@ -35,7 +35,7 @@ public interface UserService extends IService<User> {
 
     HttpRespMsg insertCompany(String companyName, String name, String phone, String vcode, String pwd, Integer type, String from);
 
-    HttpRespMsg insertUser(String id, String name, String phone,  Integer roleId, Integer  workTypeId, Double monthCost, Double cost, Integer departmentId,
+    HttpRespMsg insertUser(String id, String name,String gender, String phone,  Integer roleId, Integer  workTypeId, Double monthCost, Double cost, Integer departmentId,
                            Integer salaryType, String costApplyDate, String position, String certJson,
                            HttpServletRequest request, String inductionDate, String superiorId, String plate1,
                            String plate2, String plate3, String plate4, String plate5, String jobNumber, String inactiveDate);

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -1094,7 +1094,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     //新增或修改用户
     @Override
-    public HttpRespMsg insertUser(String targetId, String name, String phone, Integer roleId, Integer  workTypeId, Double monthCost, Double cost,
+    public HttpRespMsg insertUser(String targetId, String name,String gender, String phone, Integer roleId, Integer  workTypeId, Double monthCost, Double cost,
                                   Integer departmentId, Integer salaryType, String costApplyDate, String position, String certJson, HttpServletRequest request, String inductionDate,
                                   String superiorId, String plate1, String plate2, String plate3, String plate4, String plate5, String jobNumber, String inactiveDate) {
 
@@ -1133,6 +1133,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         User user = new User()
                                 .setId(id.toString())
                                 .setName(name)
+                                .setGender(gender)
                                 .setPassword(MD5Util.getPassword("000000"))
                                 .setPhone(phone)
                                 .setRoleId(roleId)
@@ -1217,6 +1218,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
                 userMapper.updateById(oldUser
                         .setName(name)
+                        .setGender(gender)
                         .setPhone(phone)
                         .setRoleId(roleId)
                         .setRoleName(sysRoleMapper.selectById(roleId).getRolename())

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/UserMapper.xml

@@ -95,7 +95,7 @@
 
     <!--范围分页获取人员-->
     <select id="getUserByDepartmentList" resultType="java.util.Map">
-        SELECT a.id,  a.role_id as roleId, a.role_name as roleName,  a.name, a.phone, a.portrait_url AS portraitUrl, a.role, a.company_id AS companyId, a.cost,
+        SELECT a.id,a.gender,  a.role_id as roleId, a.role_name as roleName,  a.name, a.phone, a.portrait_url AS portraitUrl, a.role, a.company_id AS companyId, a.cost,
         a.department_id AS departmentId, b.department_name AS departmentName, a.department_cascade AS departmentCascade,
         a.month_cost as monthCost, a.salary_type as salaryType, a.is_active as isActive,date_format(a.`inactive_date`, '%Y-%m-%d') AS inactiveDate, a.cost_apply_date as costApplyDate,a.plate1,a.plate2,a.plate3,a.plate4,a.plate5,
         a.job_number as jobNumber, DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%m')  as createTime

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/team/index.vue

@@ -389,6 +389,16 @@
                   <el-form-item :label="$t('lable.name')" prop="name"  v-if="user.userNameNeedTranslate == '1'">
                       <div><ww-open-data type='userName' :openid='insertForm.name'></ww-open-data></div>
                   </el-form-item>
+                  <el-form-item :label="'性别'" prop="gender">
+                    <el-select v-model="insertForm.gender" placeholder="请选择">
+                      <el-option
+                        v-for="item in genderDatas"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
                   <el-form-item :label="$t('phone')" prop="phone">
                       <el-input v-model="insertForm.phone" :placeholder="$t('peaseenterthe')" clearable></el-input>
                   </el-form-item>
@@ -938,6 +948,7 @@ export default {
         id: null,
         name: null,
         phone: null,
+        gender:null,
         // role: null,
         roleId: null,
         monthCost: null,
@@ -950,6 +961,15 @@ export default {
         certJson: [],
         plateMap: {},
       },
+      genderDatas:[
+        {
+          value: '1',
+          label: '男'
+        }, {
+          value: '0',
+          label: '女'
+        }
+      ],
       rules: {
         name: [{ required: true, message: this.$t('defaultText.PleaseEnterYourName'), trigger: "blur" }],
         // phone: [{ required: true, message: "请输入电话", trigger: "blur" }],
@@ -2550,6 +2570,7 @@ export default {
               this.insertForm = {
                 id: res.data.id,
                 name: res.data.name,
+                gender: res.data.gender,
                 phone: res.data.phone,
                 roleId: res.data.roleId,
                 monthCost: res.data.monthCost ? res.data.monthCost : 0,
@@ -2663,6 +2684,7 @@ export default {
           form = {
             name: this.insertForm.name,
             phone: this.insertForm.phone,
+            gender: this.insertForm.gender,
             // role: this.insertForm.role,
             roleId: this.insertForm.roleId,
             workTypeId: this.insertForm.workTypeId,