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

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

@@ -96,9 +96,20 @@ public class PurchaseMacodeInfo extends BaseEntity
         this.checkUrl = checkUrl;
     }
 
+    public String getCheckUrlName() {
+        return checkUrlName;
+    }
+
+    public void setCheckUrlName(String checkUrlName) {
+        this.checkUrlName = checkUrlName;
+    }
+
     /** 验收材料 */
     @ApiModelProperty(value = "验收材料")
     private String checkUrl;
+    /** 验收材料名称 */
+    @ApiModelProperty(value = "验收材料名称")
+    private String checkUrlName;
 
     /** 验收数量 */
     @ApiModelProperty(value = "绑定数量")

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

@@ -367,7 +367,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectPutinDetails" resultType="com.bonus.sgzb.material.domain.PurchaseMacodeInfo">
-        select pcd.production_time                           productionTime,
+        select pcd.production_time                    productionTime,
         mt.type_name                                  specificationType,
         mt1.type_name                                 typeName,
         pmi.ma_code                                   maCode,
@@ -375,6 +375,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         pmi.fix_code                                  fixCode,
         pcd.type_id                                   typeId,
         pcd.task_id                                   taskId,
+        pcd.check_url_name                            checkUrlName,
         pcd.check_url                                 checkUrl,
         tt.task_status								  taskStatus,
         mt.code                                       specsCode,