Browse Source

采收任务列表新增返回任务类型字段

liuyaowen 1 year ago
parent
commit
1e3393d6c2

+ 5 - 0
src/main/java/com/yunfeiyun/agmp/fms/domain/resvo/FmsTaskPickListResVo.java

@@ -81,6 +81,11 @@ public class FmsTaskPickListResVo extends BaseEntity {
     /** 审核人 */
     /** 审核人 */
     private String taskAuditor;
     private String taskAuditor;
 
 
+    /**
+     * 任务类型
+     * */
+    private String taskType;
+
 
 
     public String getTaskAudittypeContent(){
     public String getTaskAudittypeContent(){
         return CommonEnums.valueOfCode(this.taskAudittype);
         return CommonEnums.valueOfCode(this.taskAudittype);

+ 1 - 1
src/main/resources/mapper/FmsTaskpickMapper.xml

@@ -11,7 +11,7 @@
     <select id="selectFmsTaskpickList" parameterType="FmsTaskPickListReqVo" resultType="FmsTaskPickListResVo">
     <select id="selectFmsTaskpickList" parameterType="FmsTaskPickListReqVo" resultType="FmsTaskPickListResVo">
         SELECT c.cropName, c.cropType, t.taskNo, t.taskId,r.resUrl as cropPreview, p.planNo, l.landName, b.blockName,
         SELECT c.cropName, c.cropType, t.taskNo, t.taskId,r.resUrl as cropPreview, p.planNo, l.landName, b.blockName,
             p.planArea, i.pickWeight, i.pickNo, t.taskPlanstartdate, t.taskPlanenddate, s.taskrcdHour,
             p.planArea, i.pickWeight, i.pickNo, t.taskPlanstartdate, t.taskPlanenddate, s.taskrcdHour,
-            t.taskCreateddate, t.taskAudittype, t.taskStatus, t.taskContent, t.taskAuditor,t.taskVisible,
+            t.taskCreateddate, t.taskAudittype, t.taskStatus, t.taskContent, t.taskAuditor,t.taskVisible,t.taskType,
             su.userName as taskManagername
             su.userName as taskManagername
         FROM FmsTask t
         FROM FmsTask t
             LEFT JOIN FmsCrop c ON t.cropId = c.cropId
             LEFT JOIN FmsCrop c ON t.cropId = c.cropId