移动端的班组

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

@@ -77,6 +77,8 @@ public class UserController {
     private ExpenseMainTypeService expenseMainTypeService;
     @Resource
     private ExpenseTypeService expenseTypeService;
+    @Resource
+    private UserWorkTypeService userWorkTypeService;
 
     @Value("${spring.ldap.urls}")
     private String ldapUrl;
@@ -118,6 +120,11 @@ public class UserController {
     public HttpRespMsg getBaseInfo(@RequestParam String userId){
         HttpRespMsg msg=new HttpRespMsg();
         User user = userService.getById(userId);
+        UserWorkType workType = userWorkTypeService.getById(user.getWorkTypeId());
+        if(workType!=null){
+            user.setWorkType(workType.getName());
+        }
+
         msg.setData(user);
 
         return msg;

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/User.java

@@ -289,7 +289,16 @@ public class User extends Model<User> {
     */
     @TableField(exist = false)
     private Integer isExistsReport;
-
+    /**
+     * 工种id
+     */
+    @TableField("work_type_id")
+    private Integer workTypeId;
+    /**
+     * 工种名
+     */
+    @TableField(exist = false)
+    private String workType;
 
     @Override
     protected Serializable pkVal() {

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

@@ -32,6 +32,7 @@ import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
@@ -70,6 +71,8 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
     private ExcelExportService excelExportService;
     @Resource
     private WxCorpInfoService wxCorpInfoService;
+    @Resource
+    private UserWorkTypeMapper userWorkTypeMapper;
 
     @Value("${corpId}")
     private String corpId;
@@ -1531,9 +1534,19 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         List<User> groupList = userMapper.selectList(new LambdaQueryWrapper<User>()
                 .eq(user.getCompanyId() != null, User::getCompanyId, user.getCompanyId())
                 .eq(user.getDepartmentId() != null, User::getDepartmentId, user.getDepartmentId())
-                .select(User::getId, User::getName,User::getJobNumber)
-
+                .select(User::getId, User::getName,User::getJobNumber,User::getWorkTypeId)
         );
+
+        List<UserWorkType> userWorkTypeList = userWorkTypeMapper.selectList(null);
+
+        groupList.stream().forEach(member->{
+            List<UserWorkType> workTypeList = userWorkTypeList.stream().filter(userWorkType -> userWorkType.getId() == member.getWorkTypeId()).collect(Collectors.toList());
+            if(workTypeList!=null&&workTypeList.size()>0){
+                member.setWorkType(workTypeList.get(0).getName());
+            }
+        });
+
+
         msg.setData(groupList);
 
         return msg;

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/groupView/groupView.vue

@@ -6,8 +6,8 @@
       <van-cell v-for="item in list" :key="item.id" :id="item.id" :title="item.name" @click="onClick">
         <template>
           <div style="width:100%;text-align: left;" >
-            <span style="width:50%;color:#323232;">工种</span>
-            <span style="float:right;color:#323232;">工号</span>
+            <span style="width:50%;color:#323232;">{{item.workType}}</span>
+            <span style="float:right;color:#323232;">{{ item.jobNumber }}</span>
           </div>
         </template>
       </van-cell>
@@ -43,9 +43,12 @@ export default {
           this.list=res.data.map(item=>{
             return {
               name: item.name,
-              id: item.id
+              id: item.id,
+              jobNumber: item.jobNumber,
+              workType: item.workType
             }
           })
+          console.log(this.list)
 
         } else {
             this.$toast.clear();

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/groupView/info.vue

@@ -1,9 +1,13 @@
 <template>
     <div>
-        <van-nav-bar title="班组成员" left-text="返回" @click-left="back" fixed left-arrow />
+        <van-nav-bar title="通讯录" left-text="返回" @click-left="back" fixed left-arrow />
         <div style="margin-top: 44px;">
             <van-list :finished="true">
-                <van-cell v-for="item in list" :key="item.id" :id="item.id" :title="item.name" />
+                <van-cell  title="员工名称" ><div>{{ user.name }}</div></van-cell>
+                <van-cell  title="工种" ><div>{{ user.jobNumber }}</div></van-cell>
+                <van-cell  title="工号" ><div>{{ user.workType }}</div></van-cell>
+                <van-cell  title="手机号码" ><div>{{ user.phone }}</div></van-cell>
+                <van-cell  title="性别" ><div>{{ user.gender==1?'男':'女' }}</div></van-cell>
             </van-list>
         </div>
 

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/product/list.vue

@@ -989,7 +989,8 @@ export default {
                     this.exportDisabled = false
                     this.exportNotification.close()
                     if (res.code == "ok") {
-                        this.productSelections=[]
+                        this.$refs.productTbl.clearSelection();
+                        // this.productSelections=[]
                         var filePath = res.data;
                         const a = document.createElement('a'); // 创建a标签
                         a.setAttribute('download', this.$t('projectexport') + '.xlsx');// download属性