1

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

@@ -92,8 +92,8 @@ public class DepartmentController {
      * parentId 父级部门id
      */
     @RequestMapping("/add")
-    public HttpRespMsg insertDepartment(@RequestParam String name, Integer parentId, String managerId, String reportAuditUserid,String otherManagerIds, HttpServletRequest request) {
-        return departmentService.insertDepartment(name, parentId, managerId, reportAuditUserid,otherManagerIds, request);
+    public HttpRespMsg insertDepartment(@RequestParam String name, Integer parentId, String managerId, String reportAuditUserid,String otherManagerIds,String qualityManagerIds, HttpServletRequest request) {
+        return departmentService.insertDepartment(name, parentId, managerId, reportAuditUserid,otherManagerIds,qualityManagerIds, request);
     }
 
     /**
@@ -102,8 +102,8 @@ public class DepartmentController {
      * name 部门名称
      */
     @RequestMapping("/edit")
-    public HttpRespMsg updateDepartment(@RequestParam Integer id, @RequestParam String name, String managerId, String reportAuditUserid,String otherManagerIds, HttpServletRequest request) {
-        return departmentService.updateDepartment(id, name, managerId, reportAuditUserid,otherManagerIds, request);
+    public HttpRespMsg updateDepartment(@RequestParam Integer id, @RequestParam String name, String managerId, String reportAuditUserid,String otherManagerIds,String qualityManagerIds,  HttpServletRequest request) {
+        return departmentService.updateDepartment(id, name, managerId, reportAuditUserid,otherManagerIds,qualityManagerIds, request);
     }
 
     /**

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

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-01-18
+ */
+@RestController
+@RequestMapping("/department-quality-manager")
+public class DepartmentQualityManagerController {
+
+}
+

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

@@ -0,0 +1,48 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-01-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DepartmentQualityManager extends Model<DepartmentQualityManager> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("department_id")
+    private Integer departmentId;
+
+    /**
+     * 质检人id
+     */
+    @TableField("quality_id")
+    private String qualityId;
+
+    @TableField("company_id")
+    private Integer companyId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -21,5 +21,6 @@ public class DepartmentVO {
     private List<DepartmentVO> children;
     private List<HashMap> userList;
     private List<String> otherManagerIds;
+    private List<String> qualityManagerIds;
     private Integer ddDeptid;
 }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/mapper/DepartmentQualityManagerMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.DepartmentQualityManager;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-01-18
+ */
+public interface DepartmentQualityManagerMapper extends BaseMapper<DepartmentQualityManager> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.DepartmentQualityManager;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-01-18
+ */
+public interface DepartmentQualityManagerService extends IService<DepartmentQualityManager> {
+
+}

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

@@ -18,9 +18,9 @@ import java.util.List;
  * @since 2020-02-11
  */
 public interface DepartmentService extends IService<Department> {
-    HttpRespMsg insertDepartment(String departmentName, Integer superiorId, String managerId, String reportAuditUserid,String otherManagerIds, HttpServletRequest request);
+    HttpRespMsg insertDepartment(String departmentName, Integer superiorId, String managerId, String reportAuditUserid,String otherManagerIds,String qualityManagerIds, HttpServletRequest request);
 
-    HttpRespMsg updateDepartment(Integer departmentId, String departmentName, String managerId, String reportAuditUserid,String otherManagerIds, HttpServletRequest request);
+    HttpRespMsg updateDepartment(Integer departmentId, String departmentName, String managerId, String reportAuditUserid,String otherManagerIds,String qualityManagerIds, HttpServletRequest request);
 
     HttpRespMsg deleteDepartment(Integer departmentId, HttpServletRequest request);
 

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.DepartmentQualityManager;
+import com.management.platform.mapper.DepartmentQualityManagerMapper;
+import com.management.platform.service.DepartmentQualityManagerService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-01-18
+ */
+@Service
+public class DepartmentQualityManagerServiceImpl extends ServiceImpl<DepartmentQualityManagerMapper, DepartmentQualityManager> implements DepartmentQualityManagerService {
+
+}

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

@@ -76,6 +76,8 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
     private UserWorkTypeMapper userWorkTypeMapper;
     @Resource
     private PlanService planService;
+    @Resource
+    private DepartmentQualityManagerMapper departmentQualityManagerMapper;
 
     @Value("${corpId}")
     private String corpId;
@@ -83,7 +85,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
     private String providerSecret;
     //新增部门
     @Override
-    public HttpRespMsg insertDepartment(String departmentName, Integer superiorId, String managerId, String reportAuditUserid,String otherManagerIds,  HttpServletRequest request) {
+    public HttpRespMsg insertDepartment(String departmentName, Integer superiorId, String managerId, String reportAuditUserid,String otherManagerIds,String qualityManagerIds,  HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
@@ -135,7 +137,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
 
     //更新部门
     @Override
-    public HttpRespMsg updateDepartment(Integer departmentId, String departmentName,String managerId, String reportAuditUserid,String otherManagerIds, HttpServletRequest request) {
+    public HttpRespMsg updateDepartment(Integer departmentId, String departmentName,String managerId, String reportAuditUserid,String otherManagerIds,String qualityManagerIds, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
@@ -246,6 +248,20 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                     }else{
                         departmentOtherManagerMapper.delete(new QueryWrapper<DepartmentOtherManager>().eq("department_id",departmentId));
                     }
+                    if(qualityManagerIds!=null&&!qualityManagerIds.equals("")){
+                        String[] split = qualityManagerIds.split(",");
+                        List<String> list = Arrays.asList(split);
+                        departmentQualityManagerMapper.delete(new QueryWrapper<DepartmentQualityManager>().eq("department_id",departmentId));
+                        for (String s : list) {
+                            DepartmentQualityManager departmentQualityManager=new DepartmentQualityManager();
+                            departmentQualityManager.setDepartmentId(department.getDepartmentId());
+                            departmentQualityManager.setQualityId(s);
+                            departmentQualityManager.setCompanyId(companyId);
+                            departmentQualityManagerMapper.insert(departmentQualityManager);
+                        }
+                    }else{
+                        departmentQualityManagerMapper.delete(new QueryWrapper<DepartmentQualityManager>().eq("department_id",departmentId));
+                    }
                 }
             }
         } catch (NullPointerException e) {
@@ -330,16 +346,16 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         return departmentMapper.selectCount(new QueryWrapper<Department>().eq("superior_id", id)) > 0;
     }
 
-    private void fillSubDepartmentList(List<Department> allDepts, DepartmentVO parentDept, List<DepartmentOtherManager> otherManagerList) {
+    private void fillSubDepartmentList(List<Department> allDepts, DepartmentVO parentDept, List<DepartmentOtherManager> otherManagerList, List<DepartmentQualityManager> qualityManagerList) {
         Integer id = parentDept.getId();
         List<Department> collect = allDepts.stream().filter(all -> all.getSuperiorId() != null && all.getSuperiorId().intValue() == id).collect(Collectors.toList());
         List<DepartmentVO> subResult = new ArrayList<>();
         if (collect.size() > 0) {
             collect.forEach(c->{
-                DepartmentVO vo = formatDepartmentToVO(c, otherManagerList);
+                DepartmentVO vo = formatDepartmentToVO(c, otherManagerList,qualityManagerList);
                 subResult.add(vo);
                 //继续添加当前部门的子部门
-                fillSubDepartmentList(allDepts, vo, otherManagerList);
+                fillSubDepartmentList(allDepts, vo, otherManagerList,qualityManagerList);
             });
         }
         if (subResult.size() > 0) {
@@ -357,14 +373,15 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
             List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>()
                     .eq("company_id", companyId));
             List<DepartmentOtherManager> departmentOtherManagerList = departmentOtherManagerMapper.selectList(new QueryWrapper<DepartmentOtherManager>().eq("company_id", companyId));
+            List<DepartmentQualityManager> departmentQualityManagerList = departmentQualityManagerMapper.selectList(new QueryWrapper<DepartmentQualityManager>().eq("company_id", companyId));
             //结果列表
             List<DepartmentVO> list = new ArrayList<>();
             //获取全部的顶层部门
             List<Department> rootDepartments = departmentList.stream().filter(dept -> dept.getSuperiorId() == null).collect(Collectors.toList());
             rootDepartments.forEach(root->{
-                DepartmentVO rootDeptVO = formatDepartmentToVO(root, departmentOtherManagerList);
+                DepartmentVO rootDeptVO = formatDepartmentToVO(root, departmentOtherManagerList,departmentQualityManagerList);
                 list.add(rootDeptVO);
-                fillSubDepartmentList(departmentList, rootDeptVO, departmentOtherManagerList);
+                fillSubDepartmentList(departmentList, rootDeptVO, departmentOtherManagerList,departmentQualityManagerList);
             });
             //递归排序
             sortResultDeptList(list);
@@ -406,13 +423,14 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 }
             }
             List<DepartmentOtherManager> departmentOtherManagerList = departmentOtherManagerMapper.selectList(new QueryWrapper<DepartmentOtherManager>().eq("company_id", user.getCompanyId()));
+            List<DepartmentQualityManager> departmentQualityManagerList = departmentQualityManagerMapper.selectList(new QueryWrapper<DepartmentQualityManager>().eq("company_id", user.getCompanyId()));
             //结果列表
             List<DepartmentVO> list = new ArrayList<>();
             List<Department> rootDepartments = departmentList.stream().filter(dept -> dept.getSuperiorId() == null).collect(Collectors.toList());
             rootDepartments.forEach(root->{
-                DepartmentVO rootDeptVO = formatDepartmentToVO(root, departmentOtherManagerList);
+                DepartmentVO rootDeptVO = formatDepartmentToVO(root, departmentOtherManagerList,departmentQualityManagerList);
                 list.add(rootDeptVO);
-                fillSubDepartmentList(departmentList, rootDeptVO, departmentOtherManagerList);
+                fillSubDepartmentList(departmentList, rootDeptVO, departmentOtherManagerList,departmentQualityManagerList);
             });
             //返回数据
             httpRespMsg.data = list;
@@ -425,9 +443,10 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
     }
 
     //将部门PO转化为部门VO
-    private DepartmentVO formatDepartmentToVO(Department department, List<DepartmentOtherManager> departmentOtherManagerList) {
+    private DepartmentVO formatDepartmentToVO(Department department, List<DepartmentOtherManager> departmentOtherManagerList, List<DepartmentQualityManager> departmentQualityManagerList) {
         //获取该部门的其他管理者
         List<String> collect = departmentOtherManagerList.stream().filter(dm -> dm.getDepartmentId().equals(department.getDepartmentId())).map(vo -> vo.getOtherManagerId()).collect(Collectors.toList());
+        List<String> collect1 = departmentQualityManagerList.stream().filter(dm -> dm.getDepartmentId().equals(department.getDepartmentId())).map(vo -> vo.getQualityId()).collect(Collectors.toList());
         //这俩东西并没有继承关系
         return new DepartmentVO()
                 .setId(department.getDepartmentId())
@@ -435,6 +454,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 .setLabel(department.getDepartmentName())
                 .setParentId(department.getSuperiorId())
                 .setOtherManagerIds(collect)
+                .setQualityManagerIds(collect1)
                 .setReportAuditUserid(department.getReportAuditUserid())
                 .setDdDeptid(department.getDdDeptid())
                 .setSeq(department.getSeq());
@@ -960,13 +980,14 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 List<Department> allDepartmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id",companyId));
                 List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId).eq("is_active",1));
                 List<DepartmentOtherManager> departmentOtherManagerList = departmentOtherManagerMapper.selectList(new QueryWrapper<DepartmentOtherManager>().eq("company_id", companyId));
+                List<DepartmentQualityManager> departmentQualityManagerList = departmentQualityManagerMapper.selectList(new QueryWrapper<DepartmentQualityManager>().eq("company_id", companyId));
                 //结果列表
                 List<DepartmentVO> list = new ArrayList<>();
                 List<Department> rootDepartments = departmentList.stream().filter(dept -> dept.getSuperiorId() == null).collect(Collectors.toList());
                 rootDepartments.forEach(root->{
-                    DepartmentVO rootDeptVO = formatDepartmentToVO(root, departmentOtherManagerList);
+                    DepartmentVO rootDeptVO = formatDepartmentToVO(root, departmentOtherManagerList,departmentQualityManagerList);
                     list.add(rootDeptVO);
-                    fillSubDepartmentList(allDepartmentList, rootDeptVO, departmentOtherManagerList);
+                    fillSubDepartmentList(allDepartmentList, rootDeptVO, departmentOtherManagerList,departmentQualityManagerList);
                 });
                 //处理部门下人员列表
                 List<DepartmentVO> userListWithDept = getUserListWithDept(userList, list);

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

@@ -296,10 +296,11 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             double sum = plans.stream().mapToDouble(Plan::getNum).sum();
             BigDecimal decimal = new BigDecimal(sum);
             decimal=decimal.add(new BigDecimal(plan.getNum())).setScale(2,BigDecimal.ROUND_HALF_UP);
-            if(decimal.doubleValue()>product.getOrderNumber()){
-                msg.setError("创建失败,该产品下的排产计划总数量大于当前产品下的订单数量");
-                return msg;
-            }
+            //需求暂时取消 todo：限制产品下计划中数量之和大于产品设置的订单数量
+//            if(decimal.doubleValue()>product.getOrderNumber()){
+//                msg.setError("创建失败,该产品下的排产计划总数量大于当前产品下的订单数量");
+//                return msg;
+//            }
             plan.setProductName(product.getName());
         }
         if(plan.getTaskTypeId()!=null){

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.DepartmentQualityManagerMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.DepartmentQualityManager">
+        <id column="id" property="id" />
+        <result column="department_id" property="departmentId" />
+        <result column="quality_id" property="qualityId" />
+        <result column="company_id" property="companyId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, department_id, quality_id, company_id
+    </sql>
+
+</mapper>

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

@@ -352,7 +352,7 @@
                 </el-form-item>
 
                 <!-- 其他负责人 --> 
-                <el-form-item :label="$t('responsiblepersons')" prop="managerId">
+                <el-form-item :label="$t('responsiblepersons')" prop="otherManagerIds">
                     <el-select v-model="depForm.otherManagerIds" filterable v-if="user.userNameNeedTranslate != '1'" clearable multiple style="width: 100%" :placeholder="$t('defaultText.pleaseChoose')" >
                         <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id">
                           <span style="float: left">{{ item.name }}</span>
@@ -361,6 +361,17 @@
                     </el-select>
                     <selectCat :size="'medium'" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.otherManagerIds" :distinction="'4'" @selectCal="selectCal"></selectCat>
                 </el-form-item>
+
+                <!-- 质检人 --> 
+                <el-form-item :label="'质检人'" prop="qualityManagerIds">
+                    <el-select v-model="depForm.qualityManagerIds" filterable v-if="user.userNameNeedTranslate != '1'" clearable multiple style="width: 100%" :placeholder="$t('defaultText.pleaseChoose')" >
+                        <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id">
+                          <span style="float: left">{{ item.name }}</span>
+                          <span style="float: right; color: #8492a6; font-size: 13px">{{ item.jobNumber }}</span>
+                        </el-option>
+                    </el-select>
+                    <selectCat :size="'medium'" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.qualityManagerIds" :distinction="'4'" @selectCal="selectCal"></selectCat>
+                </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="departmentVisible = false">{{ $t('btn.cancel') }}</el-button>
@@ -2934,6 +2945,16 @@ export default {
           } else {
             this.$set(that.depForm, 'otherManagerIds', [])
 
+          }
+          if(that.depData.qualityManagerIds) {
+            if(Array.isArray(that.depData.qualityManagerIds)) {
+              this.$set(that.depForm, 'qualityManagerIds', that.depData.qualityManagerIds)
+            } else {
+              this.$set(that.depForm, 'qualityManagerIds', that.depData.qualityManagerIds.split(','))
+            }
+          } else {
+            this.$set(that.depForm, 'qualityManagerIds', [])
+
           }
           // console.log('点击编辑的时候', that.depData)
           // if(that.depData.reportAuditUserid != null && that.depData.reportAuditUserid != "null" && that.depData.reportAuditUserid.length > 0) {
@@ -3007,6 +3028,10 @@ export default {
           if(this.depForm.otherManagerIds) {
             form.otherManagerIds = this.depForm.otherManagerIds.toString();
           }
+          // 质检人
+          if(this.depForm.qualityManagerIds) {
+            form.qualityManagerIds = this.depForm.qualityManagerIds.toString();
+          }
           this.http.post(
             this.depForm.id == null
               ? this.port.manage.add
@@ -3023,6 +3048,7 @@ export default {
                   this.depData.label = form.name;
                   this.depData.managerId = form.managerId;
                   this.depData.otherManagerIds = form.otherManagerIds;
+                  this.depData.qualityManagerIds = form.qualityManagerIds;
                 }
 
                 this.getDepartment();