维修与报废审核的SQL修改，字段增加,优化import

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java

@@ -147,4 +147,6 @@ public class RepairTask {
     @ApiModelProperty(value = "导出选中列表")
     private List<Long> dataCondition;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java

@@ -18,6 +18,7 @@ public class RepairTaskDetails extends BaseEntity {
      */
     @ApiModelProperty(value = "id")
     private Long id;
+
     /**
      * 任务ID
      */
@@ -38,6 +39,13 @@ public class RepairTaskDetails extends BaseEntity {
      */
     @ApiModelProperty(value = "规格型号")
     private String type;
+
+    @ApiModelProperty(value = "物资单位")
+    private String unitName;
+
+    @ApiModelProperty(value = "管理模式")
+    private Integer manageType;
+
     /**
      * 编码
      */
@@ -73,5 +81,12 @@ public class RepairTaskDetails extends BaseEntity {
     @ApiModelProperty(value = "组织id")
     private Long companyId;
 
+    @ApiModelProperty(value = "退料id")
     private Long backId;
+
+    @ApiModelProperty(value = "维修人员")
+    private String repairer;
+
+    @ApiModelProperty(value = "关键字")
+    private String keyword;
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java

@@ -23,7 +23,7 @@ import com.bonus.material.task.domain.TmTaskAgreement;
 import com.bonus.material.task.mapper.TmTaskAgreementMapper;
 import com.bonus.material.task.mapper.TmTaskMapper;
 import com.bonus.material.task.domain.TmTask;
-import org.jetbrains.annotations.NotNull;
+import javax.validation.constraints.NotNull;
 import org.springframework.stereotype.Service;
 import com.bonus.material.repair.mapper.RepairAuditDetailsMapper;
 import com.bonus.material.repair.service.IRepairAuditDetailsService;

bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml

@@ -80,15 +80,17 @@
 
     <select id="getRepairTaskList" resultType="com.bonus.material.repair.domain.RepairTask">
         SELECT
-            rd.task_id,
+            rd.task_id as taskId,
+            rd.repairer,
             tt.CODE AS repairCode,
+            tt.create_time AS createTime,
+            tt.task_status AS repairStatusCode,
+            tt.company_id AS companyId,
+            tt.remark,
             bui.unit_name AS backUnit,
             bpi.pro_name AS backPro,
             su.nick_name AS createName,
-            tt.create_time AS createTime,
             bai.CODE AS backCode,
-            tt.task_status AS repairStatusCode,
-            tt.company_id AS companyId,
             GROUP_CONCAT(DISTINCT mt2.type_name) as type
         FROM
             repair_apply_details rd
@@ -202,6 +204,8 @@
             rad.ma_id as maId,
             mt2.type_name as typeName,
             mt.type_name as type,
+            mt.unit_name as unitName,
+            mt.manage_type as manageType,
             mm.ma_code as code,
             rad.repair_num as repairNum,
             rad.repaired_num as repairedNum,