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

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());
@@ -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

@@ -153,7 +153,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                     }
                 }
                 //短信通知人员进行出库
-             /*   for (LeaseApplyDetails details : leaseApplyDetails) {
+                for (LeaseApplyDetails details : leaseApplyDetails) {
                     //内部审核以后通知机具管理人进行出库
                     set = smsNotification(details, record.getCode(), set);
                 }
@@ -163,7 +163,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                     } catch (Exception e) {
                         log.info("手机号为：{}发送短信失败", str);
                     }
-                }*/
+                }
             } else if (record.getTaskStatus() == 32 && companyId != null) {
                 // 再审核领料任务信息表
                 List<LeaseApplyInfo> leaseApplyInfoList = record.getLeaseApplyInfoList();
@@ -210,7 +210,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                         }
                     }
                 }
-//                sendMessageToLeader(record);
+                sendMessageToLeader(record);
             } else {
                 // 先审核任务表
                 result += tmTaskMapper.updateTmTaskAuditStatus(record);
@@ -234,7 +234,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                         }
                     }
                 }
-//                sendMessageToLeader(record);
+                sendMessageToLeader(record);
             }
         } else {
             return 0;

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

@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             baif.`code`,
             mm.ma_code AS maCode,
             bcd.back_num AS backNum,
-            su.nick_name AS backPerson,
+            baif.back_person AS backPerson,
             bcd.create_time AS createTime,
             bpl.lot_name AS proName,
             bui.unit_name AS unitName
@@ -114,7 +114,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id
                 LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
                 LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
-                LEFT JOIN sys_user su ON su.user_id = baif.back_person
         where 1 = 1
         <if test="keyWord != null and keyWord != ''">
             and (baif.`code` like concat('%',#{keyWord},'%') or
@@ -139,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="agreementCode != null and agreementCode != ''">
             and bai.agreement_code like concat('%',#{agreementCode},'%')
         </if>
+        ORDER BY bcd.create_time DESC
     </select>
     <select id="getAllList" resultType="com.bonus.sgzb.material.domain.BackApplyInfo">
         SELECT

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

@@ -16,13 +16,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getLeaseRecordList" resultType="com.bonus.sgzb.material.domain.LeaseRecord">
         SELECT
         mt2.type_name AS typeName,
+        lai.lease_person AS leasePerson,
         mt.type_name AS typeModelName,
         bai.agreement_code AS agreementCode,
         mm.ma_code AS maCode,
         mt.unit_name AS unit,
         lod.out_num AS preNum,
         lai.`code` AS code,
-        su.nick_name AS leasePerson,
         lod.create_time AS createTime,
         bpl.lot_name AS proName,
         lod.car_code AS carCode,
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt ON mt.type_id = lod.type_id
         LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
         LEFT JOIN ma_machine mm ON mm.ma_id = lod.ma_id
-        LEFT JOIN sys_user su ON su.user_id = lai.lease_person
+        LEFT JOIN sys_user su ON su.user_id = lai.create_by
         WHERE
         1 = 1
         <if test="keyWord != null and keyWord != ''">

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

@@ -936,6 +936,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     scrap_check_details scd1
                         LEFT JOIN scrap_apply_details sad1 ON scd1.parent_id = sad1.parent_id
                         AND scd1.type_id = sad1.type_id
+                WHERE sad1.task_id = #{taskId}
                 GROUP BY
                     scd1.parent_id, sad1.type_id
             ) aa ON sad.parent_id = aa.parent_id AND sad.type_id = aa.type_id