部分列空值

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/WeldMapper.xml

@@ -4,8 +4,8 @@
 
 
     <select id="queryForWeldPage" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.WeldDto">
-        SELECT tz_ugp_weld.`sequence_nbr`,`code`,project_id,install_company,region,coding_status,coding_method,coding_date,project.`name`, tz_ugp_weld.rec_date  FROM tz_ugp_weld,
-        (SELECT `sequence_nbr`,`name` FROM tz_ugp_project ) AS project
+        SELECT tz_ugp_weld.`sequence_nbr`,`code`,project_id,install_company,region,coding_status,coding_method,coding_date,project.`name`, tz_ugp_weld.rec_date,project.installation_unit  FROM tz_ugp_weld,
+        (SELECT `sequence_nbr`,`name`,installation_unit FROM tz_ugp_project ) AS project
         <where>
             project.sequence_nbr=tz_ugp_weld.project_id
             <if test="weldDto!=null">

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WeldServiceImpl.java

@@ -179,13 +179,12 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
             weld.setProjectId(Long.valueOf(project.getSequenceNbr()));
             weld.setInstallCompany(project.getInstallationUnitId());
             weld.setCode(code);
-            weld.setRegion(project.getAddress());
+            weld.setRegion(project.getInstallRegion());
             weld.setCodingMethod(WeldMethodEnum.自动赋码.getState());
             weld.setCodingStatus(WeldCodeEnum.已赋值.getState());
             weld.setCodingDate(new Date());
             welds.add(weld);
         }
-
         saveBatch(welds);
         return welds;
     }