功能完善

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java

@@ -114,6 +114,11 @@ public class PurchasePartInfo extends BaseEntity
     @ApiModelProperty(value = "任务状态结果")
     private String taskStatusResult;
 
+    /**
+     * 提交入库时间
+     */
+    private String submitStorageTime;
+
     public String getKeyWord() {
         return keyWord;
     }
@@ -335,6 +340,14 @@ public class PurchasePartInfo extends BaseEntity
         this.purchasePrice = purchasePrice;
     }
 
+    public String getSubmitStorageTime() {
+        return submitStorageTime;
+    }
+
+    public void setSubmitStorageTime(String submitStorageTime) {
+        this.submitStorageTime = submitStorageTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputVo.java

@@ -25,4 +25,10 @@ public class RepairTestInputVo {
 
     /** 状态*/
     private String taskStatus;
+
+    /** 工程 */
+    private String projectName;
+
+    /** 单位 */
+    private String unitName;
 }

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

@@ -61,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT b.id,
                b.repairCode,
                b.maTypeName,
+               b.projectName,
+               b.unitName,
                b.wxName,
                b.wxTime,
                b.taskStatus
@@ -69,6 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ANY_VALUE(tt2.`code`) AS repairCode,
                 ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName2)) AS maTypeName,
                 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(tt2.create_time) AS wxTime,
                 ANY_VALUE(IFNULL(sd.`name`,'入库进行中')) AS taskStatus
@@ -76,6 +80,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN repair_apply_details rad on rid.repair_id=rad.id
                 LEFT JOIN sys_user us on us.user_id=rad.repairer
                 LEFT JOIN tm_task tt ON rid.task_id = tt.task_id
+                LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
+                LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
+                LEFT JOIN bm_project_lot bpl ON bai.project_id = bpl.lot_id
+                LEFT JOIN bm_unit_info bui ON bai.unit_id = bui.unit_id
                 LEFT JOIN sys_dic sd ON tt.task_status = sd.id
                 LEFT JOIN tm_task tt2 ON rad.task_id = tt2.task_id
                 LEFT JOIN (