Merge remote-tracking branch 'origin/dev-nx' into dev-nx

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java

@@ -40,6 +40,16 @@ public class SysUser extends BaseEntity
     @Excel(name = "用户名称")
     private String nickName;
 
+    public String getPickingFirst() {
+        return pickingFirst;
+    }
+
+    public void setPickingFirst(String pickingFirst) {
+        this.pickingFirst = pickingFirst;
+    }
+
+    private String pickingFirst;
+
     /** 用户邮箱 */
     @Excel(name = "用户邮箱")
     private String email;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java

@@ -271,7 +271,7 @@ public class TmTaskController extends BaseController {
             } else {
                 return AjaxResult.error("创建任务失败");
             }
-            /*UrgentProcessingUser urgentProcessingUser = new UrgentProcessingUser();
+            UrgentProcessingUser urgentProcessingUser = new UrgentProcessingUser();
             urgentProcessingUser.setCompanyId(Long.valueOf(task.getCompanyId()));
             urgentProcessingUser.setTaskTypeId(task.getTaskType());
             urgentProcessingUser.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
@@ -279,19 +279,19 @@ public class TmTaskController extends BaseController {
                 case 30:
                     urgentProcessingUser.setTaskStatus(TaskStatusEnum.STAY_BRANCH_AUDIT.getInfo());
                     break;
-                case 31:
+           /*     case 31:
                     urgentProcessingUser.setTaskStatus(TaskStatusEnum.STAY_RESPONSIBLE_DEPARTMENT_AUDIT.getInfo());
                     break;
                 case 32:
                     urgentProcessingUser.setTaskStatus(TaskStatusEnum.STAY_INTERNAL_AUDIT.getInfo());
-                    break;
+                    break;*/
             }
             List<SysUser> userList = remoteUserService.processingUser(urgentProcessingUser).getData();
             if (userList.size()>0) {
                 String message ="尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:"+ code +"的领料申请待处理，请及时查看";
                 if (CollectionUtils.isNotEmpty(userList)) {
                     for (SysUser sysUser : userList) {
-                        if (StringUtils.isNotBlank(sysUser.getPhonenumber())) {
+                        if (sysUser.getPickingFirst().contains("pickingFirst") && StringUtils.isNotBlank(sysUser.getPhonenumber())) {
                             try {
                                 remoteUserService.send(sysUser.getPhonenumber(), message);
                             } catch (Exception e) {
@@ -300,7 +300,7 @@ public class TmTaskController extends BaseController {
                         }
                     }
                 }
-            }*/
+            }
             return AjaxResult.success("任务创建成功");
         } catch (Exception e) {
             return AjaxResult.error("创建任务失败," + e.getCause().toString() + "," + e.getMessage());

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java

@@ -203,7 +203,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                         }
                     }
                 }
-                //sendMessageToLeader(record);
+                sendMessageToLeader(record);
             } else {
                 // 先审核任务表
                 result += tmTaskMapper.updateTmTaskAuditStatus(record);
@@ -227,7 +227,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                         }
                     }
                 }
-                //sendMessageToLeader(record);
+                sendMessageToLeader(record);
             }
         } else {
             return 0;
@@ -263,7 +263,7 @@ public class TmTaskServiceImpl implements TmTaskService {
             String message = "尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:" + record.getCode() + "的领料申请待处理，请及时查看";
             if (CollectionUtils.isNotEmpty(userList)) {
                 for (SysUser sysUser : userList) {
-                    if (StringUtils.isNotBlank(sysUser.getPhonenumber())) {
+                    if (sysUser.getPickingFirst().contains("pickingFirst") && StringUtils.isNotBlank(sysUser.getPhonenumber())) {
                         try {
                             remoteUserService.send(sysUser.getPhonenumber(), message);
                         } catch (Exception e) {
@@ -281,7 +281,7 @@ public class TmTaskServiceImpl implements TmTaskService {
         tmTask.setId(details.getParenntId().toString());
         //获取机具所属人员
         List<TmTask> leaseDetailByParent = tmTaskMapper.getUserByParenntId(tmTask);
-        HashSet<String> set=new HashSet<>();
+        HashSet<String> set = new HashSet<>();
         String message = "尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:" + code + "的领料申请待处理，请及时查看";
         for (TmTask tmTaskNew : leaseDetailByParent) {
             //对手机号进行处理，因为存在一种类型的机具归属多个人的情况
@@ -294,14 +294,15 @@ public class TmTaskServiceImpl implements TmTaskService {
                 }
             }
         }
-        for (String str :set) {
-             try {
-                        remoteUserService.send(str, message);
-                    } catch (Exception e) {
-                        log.info("手机号为：{}发送短信失败",str);
-             }
+        for (String str : set) {
+            try {
+                remoteUserService.send(str, message);
+            } catch (Exception e) {
+                log.info("手机号为：{}发送短信失败", str);
+            }
         }
     }
+
     @Override
     public int updateLeaseTaskAuditInfoCq(TmTask record) {
         int result = 0;
@@ -346,13 +347,13 @@ public class TmTaskServiceImpl implements TmTaskService {
     @Override
     public List<TmTask> getLeaseAuditListByOne(TmTask record) {
         Set<String> roles = SecurityUtils.getLoginUser().getRoles();
-//        if (roles.contains("jjbz") || roles.contains("fbz")) {
+        if (roles.contains(STRING_JJBZ) || roles.contains(STRING_FBZ)) {
             List<TmTask> leaseDetailByParentId = tmTaskMapper.getLeaseDetailByjjbz(record);
             return leaseDetailByParentId;
-//        } else {
-//            List<TmTask> leaseDetailByParentId = tmTaskMapper.getLeaseDetailByParentId(record);
-//            return leaseDetailByParentId;
-//        }
+        } else {
+            List<TmTask> leaseDetailByParentId = tmTaskMapper.getLeaseDetailByParentId(record);
+            return leaseDetailByParentId;
+        }
        /* for (TmTask tmTask : leaseDetailByParentId) {
             if ("2".equals(tmTask.getManageType())) {
                 List<TmTask> manageTypeByTypeId = tmTaskMapper.getManageTypeByTypeId(tmTask);
@@ -659,7 +660,7 @@ public class TmTaskServiceImpl implements TmTaskService {
         if (roles.contains(STRING_ADMIN)) {
             return tmTaskMapper.getLeaseOutListByAdmin(task);
         } else if (roles.contains(STRING_JJBZ) || roles.contains(STRING_FBZ) || roles.contains(STRING_EM01)
-        || roles.contains(STRING_EM02) || roles.contains(STRING_EM03)) {
+                || roles.contains(STRING_EM02) || roles.contains(STRING_EM03)) {
             //机具班长、副班长、机具经理、机具副经理、安全员可以查看机具设备
             return tmTaskMapper.getLeaseOutListByjjbz(task);
         } else if (roles.contains(STRING_DM01)) {
@@ -701,7 +702,7 @@ public class TmTaskServiceImpl implements TmTaskService {
             leaseOutDetails.setCreateTime(new Date());
             leaseOutDetails.setUpdateTime(new Date());
             leaseOutDetails.setOutNum(0.0);
-            res =  leaseOutDetailsMapper.insertSelective(leaseOutDetails);
+            res = leaseOutDetailsMapper.insertSelective(leaseOutDetails);
             return res;
         } else {
             return res;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java

@@ -153,4 +153,6 @@ public class RepairTask {
 
     /** 驳回原因 */
     private String remark;
+    /** 0：未提交 1：已提交 */
+    private Integer commit;
 }

sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml

@@ -54,6 +54,7 @@
         update tm_task
         set task_status = '44',
             update_by = #{userId},
+            is_commit = 1,
             update_time = now()
         where task_id in
         <foreach item="task" collection="taskList" open="(" separator="," close=")">
@@ -82,6 +83,7 @@
         tt.task_status AS repairStatusCode,
         tt.company_id AS companyId,
         tt1.code AS forecastWasteCode,
+        tt.is_commit AS commit,
         GROUP_CONCAT(DISTINCT rd.company_id) as companyIds,
         GROUP_CONCAT(DISTINCT mt2.type_name) as type
         FROM
@@ -294,6 +296,7 @@
         tt.task_status AS repairStatusCode,
         tt.company_id AS companyId,
         tt1.code AS forecastWasteCode,
+        tt.is_commit AS commit,
         GROUP_CONCAT(DISTINCT rd.company_id) as companyIds,
         GROUP_CONCAT(DISTINCT mt2.type_name) as type
         FROM

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml

@@ -278,7 +278,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 WHEN 70 THEN '已审核'
                 ELSE ''
                 END taskStatusResult,
-            su.user_name purchaserName
+            su.nick_name purchaserName
         FROM
             purchase_part_details ppd
                 LEFT JOIN purchase_part_info pci on pci.task_id=ppd.task_id

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml

@@ -259,7 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPutInListList" resultMap="PurchaseCheckInfoResult">
         select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_time, pci.update_by,
-        pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status taskStatus,su.user_name purchaserName,
+        pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status taskStatus,su.nick_name purchaserName,
         tk.create_by,
         CASE tk.task_status
         WHEN 28 THEN
@@ -269,7 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         END       as inputTime,
         CASE tk.task_status
         WHEN 28 THEN
-        us.user_name
+        us.nick_name
         ELSE
         ''
         END       as inputUser

sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeId2)) AS typeId2,
                 bpl.lot_name projectName,
                 bui.unit_name unitName,
-                ANY_VALUE(us.user_name) AS wxName,
+                ANY_VALUE(us.nick_name) AS wxName,
                 ANY_VALUE(tt2.create_time) AS wxTime,
                 ANY_VALUE(IFNULL(sd.`name`,'入库进行中')) AS taskStatus
                 FROM repair_input_details rid

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/exception/SystemException.java

@@ -3,6 +3,6 @@ package com.bonus.sgzb.system.exception;
 public class SystemException {
 
 
-    public static  final Integer TASK_ID_IS_EMPTY = 50005;
-    public static  final String TASK_ID_IS_EMPTY_MSG = "任务taskId为空!!";
+    public static final Integer TASK_ID_IS_EMPTY = 50005;
+    public static final String TASK_ID_IS_EMPTY_MSG = "任务taskId为空!!";
 }

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java

@@ -142,4 +142,6 @@ public interface SysUserMapper
     List<SysUser> selectUserByDm();
 
     void updatePurchaseNoticePerson(SysUser user);
+
+    String selectPickingFirst(SysUser user);
 }

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java

@@ -259,7 +259,7 @@ public class SysUserServiceImpl implements ISysUserService {
                 user.setCompanyId(dept.getDeptId());
             }
         }*/
-        if (deptId == 100){
+        if (deptId == 100) {
             user.setCompanyId(deptId);
         }
         if (split.length == 2) {
@@ -313,7 +313,7 @@ public class SysUserServiceImpl implements ISysUserService {
         SysDept sysDept = deptMapper.selectDeptById(deptId);
         String ancestors = sysDept.getAncestors();
         String[] split = ancestors.split(",");
-        if (deptId == 100){
+        if (deptId == 100) {
             user.setCompanyId(deptId);
         }
         if (split.length == 2) {
@@ -555,23 +555,24 @@ public class SysUserServiceImpl implements ISysUserService {
 
     /**
      * 通过任务状态获取下一级审批人的信息
+     *
      * @param urgentProcessingUser
      * @return
      */
     @Override
     public List<SysUser> urgentProcessingUser(UrgentProcessingUser urgentProcessingUser) {
-        log.info("ToDoServiceImpl  urgentProcessingUser {} begin" ,urgentProcessingUser);
+        log.info("ToDoServiceImpl  urgentProcessingUser {} begin", urgentProcessingUser);
         // 验证是否为空
         if (urgentProcessingUser == null || urgentProcessingUser.getTaskStatus() == null) {
-            throw new ServiceException(SystemException.TASK_ID_IS_EMPTY_MSG,SystemException.TASK_ID_IS_EMPTY);
+            throw new ServiceException(SystemException.TASK_ID_IS_EMPTY_MSG, SystemException.TASK_ID_IS_EMPTY);
         }
         List<SysUser> userList = new ArrayList<>();
         SysUser sysUser = new SysUser();
         sysUser.setDeptId(urgentProcessingUser.getDeptId());
-        switch (urgentProcessingUser.getTaskTypeId()){
+        switch (urgentProcessingUser.getTaskTypeId()) {
             //领料任务
             case 29:
-                userList = materialRequisitionTask(urgentProcessingUser,sysUser);
+                userList = materialRequisitionTask(urgentProcessingUser, sysUser);
                 break;
         }
         log.info("ToDoServiceImpl  urgentProcessingUser  end  !");
@@ -580,36 +581,63 @@ public class SysUserServiceImpl implements ISysUserService {
 
     /**
      * 领料任务催办
+     *
      * @param urgentProcessingUser
      * @param sysUser
      * @return
      */
-    private List<SysUser> materialRequisitionTask(UrgentProcessingUser urgentProcessingUser,SysUser sysUser) {
+    private List<SysUser> materialRequisitionTask(UrgentProcessingUser urgentProcessingUser, SysUser sysUser) {
         List<SysUser> userList = new ArrayList<>();
         //判断当前设备是否是机具设备101：机具设备，102：调试设备
-        if (urgentProcessingUser.getCompanyId().equals(101L)){
+        if (urgentProcessingUser.getCompanyId().equals(101L)) {
             //判断当前审批阶段，获取下一阶段需要催办的人员信息
-            if(TaskStatusEnum.STAY_BRANCH_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())){
+            if (TaskStatusEnum.STAY_BRANCH_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())) {
                 //获取创建人同一公司经理信息
                 userList = userMapper.selectUserByDeptId(sysUser);
+                //查询这些人中有发信息权限的人（有pickingFirst权限）
+                for (SysUser user : userList) {
+                    String s = selectPickingFirst(user);
+                    user.setPickingFirst(s);
+                }
 
-            }else if (TaskStatusEnum.STAY_RESPONSIBLE_DEPARTMENT_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())) {
+            } else if (TaskStatusEnum.STAY_RESPONSIBLE_DEPARTMENT_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())) {
                 //获取施管部经理信息
                 userList = userMapper.selectUserBySgb();
-            }else if (TaskStatusEnum.STAY_INTERNAL_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())) {
+                for (SysUser user : userList) {
+                    String s = selectPickingFirst(user);
+                    user.setPickingFirst(s);
+                }
+            } else if (TaskStatusEnum.STAY_INTERNAL_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())) {
                 //获取机具经理和机具副经理的信息
                 userList = userMapper.selectUserByEm();
+                for (SysUser user : userList) {
+                    String s = selectPickingFirst(user);
+                    user.setPickingFirst(s);
+                }
             }
             //当为调试设备时，只需要分公司审核和内部审核
         } else if (urgentProcessingUser.getCompanyId().equals(102L)) {
-            if(TaskStatusEnum.STAY_BRANCH_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())){
+            if (TaskStatusEnum.STAY_BRANCH_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())) {
                 //获取创建人同一公司经理信息
                 userList = userMapper.selectUserByDeptId(sysUser);
-            }else if (TaskStatusEnum.STAY_INTERNAL_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())) {
+                for (SysUser user : userList) {
+                    String s = selectPickingFirst(user);
+                    user.setPickingFirst(s);
+                }
+            } else if (TaskStatusEnum.STAY_INTERNAL_AUDIT.getInfo().equals(urgentProcessingUser.getTaskStatus())) {
                 //获取调试经理和机具副经理的信息
                 userList = userMapper.selectUserByDm();
+                for (SysUser user : userList) {
+                    String s = selectPickingFirst(user);
+                    user.setPickingFirst(s);
+                }
             }
         }
         return userList;
     }
+
+    private String selectPickingFirst(SysUser user) {
+        String s = userMapper.selectPickingFirst(user);
+        return s;
+    }
 }

sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -193,8 +193,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		  AND u.del_flag = '0'
 		  AND u.dept_id = #{deptId}
 		  AND sr.role_id IN (127,128,135,138,147,149)
-
-
 	</select>
 	<select id="selectUserBySgb" resultType="com.bonus.sgzb.system.api.domain.SysUser">
 		SELECT DISTINCT
@@ -220,11 +218,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			u.STATUS = '0'
 		  AND u.del_flag = '0'
 		  AND sr.role_id ='147'
-
-
 	</select>
 	<select id="selectUserByEm" resultType="com.bonus.sgzb.system.api.domain.SysUser">
-
 		SELECT DISTINCT
 			u.user_id,
 			u.dept_id,
@@ -248,7 +243,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			u.STATUS = '0'
 		  AND u.del_flag = '0'
 		  AND sr.role_id IN (127,128)
-
 	</select>
 	<select id="selectUserByDm" resultType="com.bonus.sgzb.system.api.domain.SysUser">
 		SELECT DISTINCT
@@ -275,6 +269,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		  AND u.del_flag = '0'
 		  AND sr.role_id IN (135,136)
 	</select>
+	<select id="selectPickingFirst" resultType="java.lang.String">
+		SELECT DISTINCT
+			GROUP_CONCAT( sr.role_key )
+		FROM
+			sys_user u
+				LEFT JOIN sys_user_role sur ON u.user_id = sur.user_id
+				LEFT JOIN sys_role sr ON sur.role_id = sr.role_id
+		WHERE
+			u.STATUS = '0'
+		  AND u.del_flag = '0'
+		  AND u.user_id = #{userId}
+	</select>
+
 	<insert id="insertUser" parameterType="com.bonus.sgzb.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>