Merge branch 'develop' of com_yunfei_saas/agmp_fms into master

src/main/java/com/yunfeiyun/agmp/fms/domain/resvo/FmsMachRecordListResVo.java

@@ -72,6 +72,8 @@ public class FmsMachRecordListResVo extends BaseEntity
     /** 负责人名称 */
     private String taskManagername;
 
+    private String taskType;
+
     public String getMachTypeContent() {
         if (!StringUtils.isEmpty(this.machType)){
             return DictUtils.getDictLabel(DictTypeEnums.FMS_MACH_TYPE.getCode(), this.machType);

src/main/java/com/yunfeiyun/agmp/fms/domain/resvo/FmsTaskAssetUsageResVo.java

@@ -55,6 +55,8 @@ public class FmsTaskAssetUsageResVo {
 
     private String taskrcdId;
 
+    private String taskType;
+
     public String getGoodsTypeContent(){
         return DictUtils.getDictLabel(DictTypeEnums.WMS_GOODS_TYPE.getCode(),this.goodsType);
     }

src/main/resources/mapper/FmsMachMapper.xml

@@ -41,7 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectFmsMachRecordList" parameterType="FmsMachRecordListReqVo" resultType="FmsMachRecordListResVo">
         SELECT ma.machName, ma.machType, p.planNo, t.taskId, t.taskNo, c.cropName, c.cropType, c.cropMaintype, m.taskmachUsedcount,
-            ma.machNo, ma.machSpec, tc.taskrcdId, tc.taskrcdCompletedate, t.taskManager, u.userName AS taskManagername
+            ma.machNo, ma.machSpec, tc.taskrcdId, tc.taskrcdCompletedate, t.taskManager, u.userName AS taskManagername,
+        t.taskType
         FROM FmsTaskmachine AS m
             JOIN FmsTaskrcd AS tc ON m.taskrcdId = tc.taskrcdId AND tc.taskrcdAuditstatus = #{taskrcdAuditstatus}
             JOIN FmsTask AS t ON tc.taskId = t.taskId

src/main/resources/mapper/FmsTaskassetMapper.xml

@@ -118,7 +118,8 @@
         g.goodsUnit,
         g.goodsSpec,
         r.taskrcdCompletedate,
-        su.userName AS taskManagername
+        su.userName AS taskManagername,
+        t.taskType
         FROM
         FmsTaskasset a
         LEFT JOIN FmsTaskrcd r ON r.taskrcdId = a.taskrcdId