bug

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

@@ -20,10 +20,11 @@
 
     <select id="queryProjectPage"  resultType="com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto">
         SELECT
-        pt.*,
+        pt.*,( SELECT biz_org_name FROM cb_org_usr WHERE sequence_nbr = ru.supervise_dept_id ) AS superviseDept,
+        ( SELECT biz_org_name FROM cb_org_usr WHERE sequence_nbr = ru.inspection_unit_id ) AS inspectionUnit,
         ( SELECT log.context FROM tz_ugp_initiation_log log WHERE log.instance_id = pt.instance_id ORDER BY log.rec_date DESC LIMIT 1 ) AS context
         FROM
-        tz_ugp_project pt
+        tz_ugp_project pt LEFT JOIN tz_ugp_supervise_rule ru ON RIGHT( pt.install_region_code, 6 ) = ru.admin_region_code
         <where>
             <if test="roleName == '建设单位'">
                 and pt.construction_unit_id = #{companyId}

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

@@ -537,6 +537,7 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
         }
                       List<ProjectDto> projects = page.getRecords();
         for (ProjectDto projectDto : projects) {
+            projectDto.setProgressStatus("0");
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             if (!ObjectUtils.isEmpty(projectDto.getStartDate())) {
                 String startDate = simpleDateFormat.format(projectDto.getStartDate());