bug更新

jwtech-admin-page/src/layout/components/Navbar.vue

@@ -224,7 +224,7 @@ export default {
         type: "warning",
       }).then(() => {
         this.$store.dispatch("LogOut").then(() => {
-          location.href = "http://210.76.82.26/wr-portal/login?redirect=%2Fhome";
+          location.href = "https://210.76.82.26/wr-portal/login?redirect=%2Fhome";
           // window.open("http://210.76.82.26/wr-portal/login", "_self");
         });
       });

jwtech-admin-page/src/views/building/peasantWorkerSystem/index.vue

@@ -502,6 +502,7 @@ export default {
       }
     },
     remoteMethod(query) {
+      this.proQueryParams.data.proNo=null;
       if (query !== "") {
         // console.log(444, query);
         this.proQueryParams.data.projectName = query;
@@ -520,6 +521,7 @@ export default {
       // if (!keyWork) {
       console.log(666);
       this.proQueryParams.data.projectName = null;
+      this.proQueryParams.data.proNo=null;
       listInfo(this.proQueryParams).then((res) => {
         this.projectNameOptions[0].options = res.records;
       });
@@ -532,13 +534,17 @@ export default {
       console.log(res)
       this.form.proNo = res.proNo;
       this.form.proCode = res.id;
+
       this.form.projectName=res.projectName;
       this.form.sectionName=res.sectionName;
+      if (res.adcd){
         this.form.adcd = res.adcd;
+      }
     },
     /** 查询农民工实名信息关联项目列表 */
     getList() {
       this.loading = true;
+      this.queryParams.data.proNo=null;
       listRealNamePro(this.queryParams).then((response) => {
         this.realNameProList = response.records;
         this.total = response.total;

jwtech-admin-page/src/views/building/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue

@@ -354,7 +354,7 @@ import {
 
 export default {
   name: "Gckzfdb",
-  props: ["proNo", "proCode"],
+  props: ["proNo", "projectCode"],
 
   data() {
     return {
@@ -445,7 +445,7 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.data.proNo = this.proNo;
-      this.queryParams.data.proCode = this.proCode;
+      this.queryParams.data.projectCode = this.projectCode;
       listGckzfdb(this.queryParams).then((response) => {
         this.gckzfdbList = response.records;
         this.total = response.total;
@@ -574,7 +574,7 @@ export default {
             });
           } else {
             this.form.proNo = this.proNo;
-            this.form.proCode = this.proCode;
+            this.form.projectCode = this.projectCode;
             addGckzfdb(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");

jwtech-admin-page/src/views/building/peasantWorkerSystem/options/index.vue

@@ -35,7 +35,7 @@
       >
         <realNameSystem
           :proNo="formData.proNo"
-          :proCode=null
+          :proCode="formData.proCode"
           :isApproval="formData.isApproval"
           v-if="formData.proNo"
         />
@@ -57,7 +57,7 @@
       >
         <payroll
           :proNo="formData.proNo"
-          :proCode=null
+          :proCode="formData.proCode"
           v-if="activeName == 'payroll'"
         />
       </el-tab-pane>
@@ -69,7 +69,7 @@
       >
         <wageStatistics
           :proNo="formData.proNo"
-          :proCode=null
+          :proCode="formData.proCode"
           v-if="activeName == 'wageStatistics'"
         />
       </el-tab-pane>
@@ -79,7 +79,7 @@
         name="marginAccount"
         :lazy="true"
       >
-        <marginAccount :proNo="formData.proNo" :proCode=null />
+        <marginAccount :proNo="formData.proNo" :proCode="formData.proCode" />
       </el-tab-pane>
 
       <el-tab-pane
@@ -90,7 +90,7 @@
       >
         <specificMarginAccount
           :proNo="formData.proNo"
-          :proCode=null
+          :proCode="formData.proCode"
         />
       </el-tab-pane>
 
@@ -102,7 +102,7 @@
       >
         <guaranteePaymentProjectFunds
           :proNo="formData.proNo"
-          :proCode=null
+          :projectCode="formData.proCode"
         />
       </el-tab-pane>
       <el-tab-pane
@@ -113,7 +113,7 @@
       >
         <rightsProtectionNoticeBoard
           :proNo="formData.proNo"
-          :proCode=null
+          :proCode="formData.proCode"
         />
       </el-tab-pane>
       <el-tab-pane
@@ -124,7 +124,7 @@
       >
         <specialManagementStaff
           :proNo="formData.proNo"
-          :proCode=null
+          :proCode="formData.proCode"
         />
       </el-tab-pane>
       <el-tab-pane
@@ -135,7 +135,7 @@
       >
         <sgProjectmanager
           :proNo="formData.proNo"
-          :proCode=null
+          :proCode="formData.proCode"
           :isApproval="formData.isApproval"
         />
       </el-tab-pane>
@@ -145,7 +145,7 @@
         name="jlProjectmanager"
         :lazy="true"
       >
-        <jlProjectmanager :proNo="formData.proNo" :proCode=null />
+        <jlProjectmanager :proNo="formData.proNo" :proCode="formData.proCode" />
       </el-tab-pane>
       <el-tab-pane
         v-if="checkPermi(['building:nmgsmzgl:qxqk'])"
@@ -153,7 +153,7 @@
         name="unpaidSituation"
         :lazy="true"
       >
-        <unpaidSituation :proNo="formData.proNo" :proCode=null />
+        <unpaidSituation :proNo="formData.proNo" :proCode="formData.proCode"/>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -206,6 +206,9 @@ export default {
     getList() {
       getRealNamePro(this.$route.query.baseDataId).then((response) => {
         this.formData = response.data;
+        if (!response.data.sectionName){
+          this.formData.proCode=null;
+        }
         console.log(111, this.formData);
       });
     },

jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue

@@ -1082,6 +1082,7 @@ export default {
       this.loading = true;
       this.queryParams.data.proNo = this.proNo;
       this.queryParams.data.proCode = this.proCode;
+      console.log(this.proCode)
       listRealName(this.queryParams).then((response) => {
         this.realNameList = response.records;
         this.total = response.total;

jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue

@@ -1204,10 +1204,10 @@ export default {
       this.reset();
 
       this.open = true;
-      this.title = "添加竣工验收";
+      this.title = "添加项目完工验收";
     },
     viewInfo(row) {
-      this.viewTitle = "查看竣工验收";
+      this.viewTitle = "查看完工验收";
       this.projectAcceptanceMsg = row;
       console.log("projectAcceptanceMsg", row);
       this.viewOpen = true;

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/index.vue

@@ -82,7 +82,7 @@
           v-if="activeName === 'qualityControl'"
           :projectName="formData.projectName"
           :proNo="formData.proNo"
-          :proCode="formData.proCode"
+          :proCode="null"
         />
       </el-tab-pane>
       <el-tab-pane
@@ -112,7 +112,7 @@
       >
         <scheduleManagement
           :proNo="formData.proNo"
-          :proCode="formData.proCode"
+          :proCode="null"
         />
       </el-tab-pane>
       <el-tab-pane
@@ -124,7 +124,7 @@
         <supervisionAndManagement
           v-if="activeName === 'supervisionAndManagement'"
           :proNo="formData.proNo"
-          :proCode="formData.proCode"
+          :proCode="null"
         />
       </el-tab-pane>
       <el-tab-pane
@@ -135,7 +135,7 @@
       >
         <projectLegalPersonEvaluation
           :proNo="formData.proNo"
-          :proCode="formData.proCode"
+          :proCode="null"
         />
       </el-tab-pane>
       <el-tab-pane
@@ -144,7 +144,7 @@
         :disabled="!routeList[1].isEdit"
         :lazy="true"
       >
-        <investment :proNo="formData.proNo" :proCode="formData.proCode" />
+        <investment :proNo="formData.proNo" :proCode="null" />
       </el-tab-pane>
       <!-- <el-tab-pane
         label="农民工实名制管理"
@@ -166,7 +166,7 @@
       >
         <projectAcceptance
           :proNo="formData.proNo"
-          :proCode="formData.proCode"
+          :proCode="null"
           :projectName="formData.projectName"
           :projectLegalPerson="formData.projectLegalPerson"
         />

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/scheduleManagement/index.vue

@@ -13,7 +13,7 @@
       >
         <annualPlanManagement
           :proNo="proNo"
-          :proCode="proCode"
+          :proCode="null"
           :formData="formData"
         />
       </el-tab-pane>

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/scheduleManagement/options/annualPlanManagement.vue

@@ -734,6 +734,7 @@ export default {
     /** 查询进度计划列表 */
     getList() {
       this.loading = true;
+      this.queryParams.data.proNo=this.proNo
       listPlan(this.queryParams).then((response) => {
         this.planList = response.records;
         this.total = response.total;

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/scheduleManagement/options/completionOfInvestment.vue

@@ -1032,6 +1032,7 @@ export default {
     /** 查询进度计划列表 */
     getList() {
       this.loading = true;
+      this.queryParams.data.proNo=this.proNo
       listPlan(this.queryParams).then((response) => {
         this.planList = response.records;
         this.total = response.total;

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/scheduleManagement/options/progressFilling.vue

@@ -998,6 +998,7 @@ export default {
     /** 查询进度计划列表 */
     getList() {
       this.loading = true;
+      this.queryParams.data.proNo=this.proNo
       listPlan(this.queryParams).then((response) => {
         this.planList = response.records;
         this.total = response.total;

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/supervisionAndManagement/options/record.vue

@@ -73,7 +73,6 @@
             type="text"
             icon="el-icon-view"
             @click="viewInfo(scope.row)"
-            v-hasPermi="['build:record:view']"
             >查看</el-button
           >
           <!-- <el-button

jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue

@@ -192,7 +192,7 @@
         </el-table-column>
         <el-table-column label="投资完成率(%)" align="center" prop="333">
           <template slot-scope="scope">
-            {{ (scope.row.zfTotal / scope.row.fundsTotal) * 100 }}
+            {{  scope.row.zfTotal?parseFloat(((scope.row.zfTotal / scope.row.xdTotal) * 100)).toFixed(2):"待下达资金填报" }}
           </template>
         </el-table-column>
       </el-table-column>

jwtech-admin-page/src/views/projectAndEnterpriseBindingMange/projectBinding/index.vue

@@ -117,7 +117,7 @@
       <el-table
         v-loading="loading"
         :data="infoList"
-        row-key="id"
+        row-key="proNo"
         :expand-row-keys="expands1"
         @selection-change="handleSelectionChange"
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
@@ -170,7 +170,7 @@
         min-width="120"
       >
         <template slot-scope="scope">
-          {{"未绑定"}}
+          {{ scope.row.bindStatus === "1" ? "已绑定" : "未绑定" }}
         </template>
       </el-table-column>
       <!-- <el-table-column
@@ -215,15 +215,17 @@
                 size="mini"
                 type="text"
                 icon="el-icon-connection"
+                v-if="scope.row.bindStatus === '0'"
                 >绑定</el-button
               >
             </el-popconfirm>
-<!--            <el-button-->
+            <el-button
-<!--              size="mini"-->
+              size="mini"
-<!--              type="text"-->
+              type="text"
-<!--              icon="el-icon-connection"-->
+              icon="el-icon-connection"
-<!--              >已绑定</el-button-->
+              v-if="scope.row.bindStatus === '1'"
-<!--            >-->
+              >已绑定</el-button
+            >
           </div>
         </template>
       </el-table-column>

jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue

@@ -86,7 +86,7 @@
     <el-table v-loading="loading" :data="infoList">
       <!-- <el-table-column type="selection" width="55" align="center" fixed /> -->
       <el-table-column
-        label="序号"
+        label="序号11"
         type="index"
         width="50"
         align="center"

jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java

@@ -11,6 +11,7 @@ import com.jianwei.common.constant.UserConstants;
 import com.jianwei.common.core.domain.entity.SysDept;
 import com.jianwei.common.core.domain.entity.SysRole;
 import com.jianwei.common.core.domain.entity.SysUser;
+import com.jianwei.common.utils.StringUtils;
 import com.jianwei.common.utils.password.MD5Util;
 import com.jianwei.common.utils.password.PasswordUtil;
 import com.jianwei.common.utils.uuid.IdUtils;
@@ -90,11 +91,13 @@ public class WaterScheduled {
         String records = JSONObject.parseObject(data).getString("records");
         List<SingleUser> singleUserList = JSONObject.parseArray(records, SingleUser.class);
         for (SingleUser singleUser : singleUserList) {
+
             String id = singleUser.getId();
             QueryWrapper<SysUser> query = Wrappers.query();
             query.eq("single_user_id",id);
             SysUser user = userService.getOne(query,false);
             Boolean flag = (ObjectUtil.isEmpty(user));
+
             if(flag){
                 user = new SysUser();
                 user.preInsert();
@@ -114,8 +117,13 @@ public class WaterScheduled {
             SingleOrg org = singleUser.getOrg();
             List<String> collect =new ArrayList<>();
             List<SingleRole> roleList = singleUser.getRoleList();
+
             for (SingleRole roles:roleList){
-                SysRole roleName = roleService.getOne(new QueryWrapper<SysRole>().eq("role_name", roles.getName()));
+                if (roles.getCode().equals("YW00111")||roles.getCode().equals("YW00177")||roles.equals("YW00178")
+                ||roles.getCode().equals("YW00179")||roles.equals("YW00180")){
+                    user.setUserType("01");
+                }
+                SysRole roleName = roleService.getOne(new QueryWrapper<SysRole>().eq("role_key", roles.getCode()));
                 if (ObjectUtil.isNotEmpty(roleName)){
                     collect.add(roleName.getId());
                 }
@@ -129,7 +137,9 @@ public class WaterScheduled {
                 user.setDeptId(org.getId());
                 String type = singleUser.getType();
                 if(type.equals("GA")||type.equals("DEV_OPS")){ //政务机构
+                    if (StringUtils.isEmpty(user.getUserType())) {
                         user.setUserType("00");
+                    }
                     if(CollectionUtil.isEmpty(roles)){
                         String deptId = user.getDeptId();
                         SysDept byId = deptService.getById(deptId);
@@ -153,12 +163,16 @@ public class WaterScheduled {
                         }
                     }
                 }else if(type.equals("SVC")||type.equals("ORG")||type.equals("LP")){  //服务机构
+                    if (StringUtils.isEmpty(user.getUserType())) {
                         user.setUserType("01");
+                    }
                     if(CollectionUtil.isEmpty(roles)){
                         collect.add(YW00112);
                     }
                 }else if(type.equals("FIRM")){ //厂商
+                    if (StringUtils.isEmpty(user.getUserType())) {
                         user.setUserType("00");
+                    }
                     if(CollectionUtil.isEmpty(roles)){
                         collect.add(YW00106);
                     }

jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java

@@ -184,7 +184,7 @@ public class evaluateTask {
     @Autowired
     BsSgcJsjdBuiComAccService bsSgcJsjdBuiComAccService;
     //项目法人履职评价
-    @Scheduled(cron = "0 0/2 * * * ?") //每天0点1分执行
+    @Scheduled(cron = "0 0 1 * * ?") //每天1点执行
     public void proEvaluate(){
         List<BsSgcJsjdBuiConstrMeas> list = bsSgcJsjdBuiConstrMeasService.list(null);
         LocalDate date = LocalDate.now();
@@ -199,23 +199,32 @@ public class evaluateTask {
                         .orderByDesc("COMPLETION_ACCEPTANCE_TIME"));
                 List<BsSgcjsjdBuiProInfo> list2 = bsSgcjsjdBuiProInfoService.list(new QueryWrapper<BsSgcjsjdBuiProInfo>()
                         .eq("PRO_NO", bsSgcJsjdBuiConstrMeas.getProNo()));
-                BsSgcJsjdBuiComAcc one = list1.get(0);
-                BsSgcjsjdBuiProInfo bs = list2.get(0);
                 LocalDate localDate = null;
+                int monthValue1 = 0;
+                int dayOfYear2 = 0;
+                BsSgcJsjdBuiComAcc one=new BsSgcJsjdBuiComAcc();
+                if (CollectionUtil.isNotEmpty(list1)){
+                 one = list1.get(0);
                     if (ObjectUtil.isNotEmpty(one.getCompletionAcceptanceTime())) {
                         localDate = one.getCompletionAcceptanceTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+                        monthValue1=localDate.getMonthValue();
+                        dayOfYear2=localDate.getYear();
                     }
-                int monthValue1 = localDate.getMonthValue();
+                }
-                int dayOfYear2 = localDate.getYear();
+                BsSgcjsjdBuiProInfo bs=new BsSgcjsjdBuiProInfo();
+                if (CollectionUtil.isNotEmpty(list2)) {
+                    bs = list2.get(0);
+                }
+                if (bsSgcJsjdBuiConstrMeas.getSectionName().equals(bs.getProjectName())) {
                     Date approvalTime1 = bsSgcJsjdBuiConstrMeas.getApprovalTime1();
                     if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiConstrMeas.getApprovalTime1()) && ObjectUtil.isNotEmpty(one.getCompletionAcceptanceTime())) {
                         Date date2 = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
-                    long l = DateUtil.betweenYear(approvalTime1, date2, true) + 1;
+                        long l = DateUtil.betweenYear(approvalTime1, date2, true);
                         LocalDate approvalTime = approvalTime1.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
                         int month = approvalTime.getMonthValue();
                         int year = approvalTime.getYear();
                         for (int i = 0; i <= l; i++) {
-                        if (i != l && i == 0) {
+                            if (dayOfYear2 != year && i == 0) {
                                 if (month <= 3) {
                                     BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                     legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1);
@@ -315,8 +324,8 @@ public class evaluateTask {
                                     bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
                                 }
                             } else if (i == l) {
-                            if (dayOfYear2==year+i) {
+                                if (dayOfYear2 == year) {
-                          for (int j = month,i1=1; j <= monthValue1; j = j + 3,i++) {
+                                    for (int j = month, i1 = 1; j <= monthValue1 + 2; j = j + 3, i1++) {
                                         if (j <= 3) {
                                             BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                             legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1);
@@ -368,15 +377,108 @@ public class evaluateTask {
                                             bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
                                         }
                                     }
+                                } else {
+                                    if (monthValue1 <= 3) {
+                                        BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
+                                        legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1);
+                                        legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
+                                        legalEvaluate.setProNo(one.getProNo());
+                                        legalEvaluate.setProCode(one.getProCode());
+                                        legalEvaluate.setCycle(dayOfYear2 + "-" + 1 + "至" + dayOfYear2 + "-" + 3);
+                                        BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
+                                        if (ObjectUtil.isEmpty(byId)) {
+                                            legalEvaluate.setEvaluateStatus("0");
+                                        }
+                                        bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
+
+                                    } else if (monthValue1 <= 6 && monthValue1 > 3) {
+                                        BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
+                                        legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1);
+                                        legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
+                                        legalEvaluate.setProNo(one.getProNo());
+                                        legalEvaluate.setProCode(one.getProCode());
+                                        legalEvaluate.setCycle(dayOfYear2 + "-" + 1 + "至" + dayOfYear2 + "-" + 3);
+                                        BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
+                                        if (ObjectUtil.isEmpty(byId)) {
+                                            legalEvaluate.setEvaluateStatus("0");
+                                        }
+                                        bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
+                                        legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2);
+                                        legalEvaluate.setCycle(dayOfYear2 + "-" + 4 + "至" + dayOfYear2 + "-" + 6);
+                                        BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
+                                        if (ObjectUtil.isEmpty(byId1)) {
+                                            legalEvaluate.setEvaluateStatus("0");
+                                        }
+                                        bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
+                                    } else if (monthValue1 <= 9 && monthValue1 > 6) {
+                                        BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
+                                        legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1);
+                                        legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
+                                        legalEvaluate.setProNo(one.getProNo());
+                                        legalEvaluate.setProCode(one.getProCode());
+                                        legalEvaluate.setCycle(dayOfYear2 + "-" + 1 + "至" + dayOfYear2 + "-" + 3);
+                                        BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
+                                        if (ObjectUtil.isEmpty(byId)) {
+                                            legalEvaluate.setEvaluateStatus("0");
+                                        }
+                                        bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
+                                        legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2);
+                                        legalEvaluate.setCycle(dayOfYear2 + "-" + 4 + "至" + dayOfYear2 + "-" + 6);
+                                        BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
+                                        if (ObjectUtil.isEmpty(byId1)) {
+                                            legalEvaluate.setEvaluateStatus("0");
+                                        }
+                                        bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
+                                        legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3);
+                                        legalEvaluate.setCycle(dayOfYear2 + "-" + 7 + "至" + dayOfYear2 + "-" + 9);
+                                        BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
+                                        if (ObjectUtil.isEmpty(byId2)) {
+                                            legalEvaluate.setEvaluateStatus("0");
+                                        }
+                                        bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
+                                    } else {
+                                        BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
+                                        legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1);
+                                        legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
+                                        legalEvaluate.setProNo(one.getProNo());
+                                        legalEvaluate.setProCode(one.getProCode());
+                                        legalEvaluate.setCycle(dayOfYear2 + "-" + 1 + "至" + dayOfYear2 + "-" + 3);
+                                        BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
+                                        if (ObjectUtil.isEmpty(byId)) {
+                                            legalEvaluate.setEvaluateStatus("0");
+                                        }
+                                        bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
+                                        legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2);
+                                        legalEvaluate.setCycle(dayOfYear2 + "-" + 4 + "至" + dayOfYear2 + "-" + 6);
+                                        BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
+                                        if (ObjectUtil.isEmpty(byId1)) {
+                                            legalEvaluate.setEvaluateStatus("0");
+                                        }
+                                        bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
+                                        legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3);
+                                        legalEvaluate.setCycle(dayOfYear2 + "-" + 7 + "至" + dayOfYear2 + "-" + 9);
+                                        BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
+                                        if (ObjectUtil.isEmpty(byId2)) {
+                                            legalEvaluate.setEvaluateStatus("0");
+                                        }
+                                        bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
+                                        legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4);
+                                        legalEvaluate.setCycle(dayOfYear2 + "-" + 10 + "至" + dayOfYear2 + "-" + 12);
+                                        BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
+                                        if (ObjectUtil.isEmpty(byId3)) {
+                                            legalEvaluate.setEvaluateStatus("0");
+                                        }
+                                        bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
+                                    }
                                 }
                             } else {
-                            for (int j = 1,i1=1; j <= 10; j = j + 3,i++) {
+                                for (int j = 1, i1 = 1; j <= 10; j = j + 3, i1++) {
                                     BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                     legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
                                     legalEvaluate.setProNo(one.getProNo());
                                     legalEvaluate.setProCode(one.getProCode());
                                     legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + i1);
-                                legalEvaluate.setCycle((year + i-1) + "-" + j + "至" + (year + i-1) + "-" + (j + 2));
+                                    legalEvaluate.setCycle((year + i) + "-" + j + "至" + (year + i) + "-" + (j + 2));
                                     BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                     if (ObjectUtil.isEmpty(byId3)) {
                                         legalEvaluate.setEvaluateStatus("0");
@@ -386,18 +488,22 @@ public class evaluateTask {
                             }
                         }
                     } else {
-                    long l = DateUtil.betweenYear(approvalTime1, date1, true) + 1;
+
+                        /** 无竣工验收
+                         *
+                         * */
+                        long l = DateUtil.betweenYear(approvalTime1, date1, true);
                         LocalDate approvalTime = approvalTime1.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
                         int month = approvalTime.getMonthValue();
                         int year = approvalTime.getYear();
                         for (int i = 0; i <= l; i++) {
-                        if (i != l && i == 0) {
+                            if (dayOfYear != year && i == 0) {
                                 if (month <= 3) {
                                     BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                     legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1);
                                     legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
-                                legalEvaluate.setProNo(one.getProNo());
+                                    legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo());
-                                legalEvaluate.setProCode(one.getProCode());
+                                    legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode());
                                     legalEvaluate.setCycle(year + "-" + 1 + "至" + year + "-" + 3);
                                     BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                     if (ObjectUtil.isEmpty(byId)) {
@@ -430,11 +536,11 @@ public class evaluateTask {
                                     bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
 
 
-                            } else if (month <= 6 && month > 4) {
+                                } else if (month <= 6 && month > 3) {
                                     BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                     legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
-                                legalEvaluate.setProNo(one.getProNo());
+                                    legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo());
-                                legalEvaluate.setProCode(one.getProCode());
+                                    legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode());
                                     legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2);
                                     legalEvaluate.setCycle(year + "-" + 4 + "至" + year + "-" + 6);
                                     BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
@@ -461,8 +567,8 @@ public class evaluateTask {
                                 } else if (month <= 9 && month > 6) {
                                     BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                     legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
-                                legalEvaluate.setProNo(one.getProNo());
+                                    legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo());
-                                legalEvaluate.setProCode(one.getProCode());
+                                    legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode());
                                     legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3);
                                     legalEvaluate.setCycle(year + "-" + 7 + "至" + year + "-" + 9);
                                     BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
@@ -481,8 +587,8 @@ public class evaluateTask {
                                 } else {
                                     BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                     legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
-                                legalEvaluate.setProNo(one.getProNo());
+                                    legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo());
-                                legalEvaluate.setProCode(one.getProCode());
+                                    legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode());
                                     legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4);
                                     legalEvaluate.setCycle(year + "-" + 10 + "至" + year + "-" + 12);
                                     BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
@@ -492,14 +598,14 @@ public class evaluateTask {
                                     bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
                                 }
                             } else if (i == l) {
-                            if (year+i==dayOfYear){
+                                if (year == dayOfYear) {
-                                for (int j = month,i1=1; j <= monthValue; j = j + 3,i++) {
+                                    for (int j = month, i1 = 1; j <= monthValue + 2; j = j + 3, i1++) {
                                         if (j <= 3) {
                                             BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
-                                        legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1);
+                                            legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i1 + 1);
                                             legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
-                                        legalEvaluate.setProNo(one.getProNo());
+                                            legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo());
-                                        legalEvaluate.setProCode(one.getProCode());
+                                            legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode());
                                             legalEvaluate.setCycle(dayOfYear + "-" + 1 + "至" + dayOfYear + "-" + 3);
                                             BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                             if (ObjectUtil.isEmpty(byId)) {
@@ -511,9 +617,9 @@ public class evaluateTask {
                                             BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                             legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2);
                                             legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
-                                        legalEvaluate.setProNo(one.getProNo());
+                                            legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo());
-                                        legalEvaluate.setProCode(one.getProCode());
+                                            legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode());
-                                        legalEvaluate.setCycle(dayOfYear + "-" + 1 + "至" + dayOfYear + "-" + 3);
+                                            legalEvaluate.setCycle(dayOfYear + "-" + 4 + "至" + dayOfYear + "-" + 6);
                                             BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                             if (ObjectUtil.isEmpty(byId)) {
                                                 legalEvaluate.setEvaluateStatus("0");
@@ -523,8 +629,8 @@ public class evaluateTask {
                                             BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                             legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3);
                                             legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
-                                        legalEvaluate.setProNo(one.getProNo());
+                                            legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo());
-                                        legalEvaluate.setProCode(one.getProCode());
+                                            legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode());
                                             legalEvaluate.setCycle(dayOfYear + "-" + 7 + "至" + dayOfYear + "-" + 9);
                                             BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                             if (ObjectUtil.isEmpty(byId)) {
@@ -535,8 +641,8 @@ public class evaluateTask {
                                             BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                             legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4);
                                             legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
-                                        legalEvaluate.setProNo(one.getProNo());
+                                            legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo());
-                                        legalEvaluate.setProCode(one.getProCode());
+                                            legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode());
                                             legalEvaluate.setCycle(dayOfYear + "-" + 10 + "至" + dayOfYear + "-" + 12);
                                             BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                             if (ObjectUtil.isEmpty(byId)) {
@@ -546,59 +652,59 @@ public class evaluateTask {
                                         }
                                     }
                                 } else {
-                            if (month <= 3) {
+                                    if (monthValue <= 3) {
                                         BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                         legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1);
                                         legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
-                                legalEvaluate.setProNo(one.getProNo());
+                                        legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo());
-                                legalEvaluate.setProCode(one.getProCode());
+                                        legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode());
-                                legalEvaluate.setCycle((year+i) + "-" + 1 + "至" + (year+i) + "-" + 3);
+                                        legalEvaluate.setCycle(dayOfYear + "-" + 1 + "至" + dayOfYear + "-" + 3);
                                         BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                         if (ObjectUtil.isEmpty(byId)) {
                                             legalEvaluate.setEvaluateStatus("0");
                                         }
                                         bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
 
-                            } else if (month <= 6 && month > 3) {
+                                    } else if (monthValue <= 6 && monthValue > 3) {
                                         BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                         legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1);
                                         legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
-                                legalEvaluate.setProNo(one.getProNo());
+                                        legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo());
-                                legalEvaluate.setProCode(one.getProCode());
+                                        legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode());
-                                legalEvaluate.setCycle((year+i) + "-" + 1 + "至" + (year+i) + "-" + 3);
+                                        legalEvaluate.setCycle(dayOfYear + "-" + 1 + "至" + dayOfYear + "-" + 3);
                                         BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                         if (ObjectUtil.isEmpty(byId)) {
                                             legalEvaluate.setEvaluateStatus("0");
                                         }
                                         bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
                                         legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2);
-                                legalEvaluate.setCycle((year+i) + "-" + 4 + "至" + (year+i) + "-" + 6);
+                                        legalEvaluate.setCycle(dayOfYear + "-" + 4 + "至" + dayOfYear + "-" + 6);
                                         BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                         if (ObjectUtil.isEmpty(byId1)) {
                                             legalEvaluate.setEvaluateStatus("0");
                                         }
                                         bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
-                            } else if (month <= 9 && month > 6) {
+                                    } else if (monthValue <= 9 && monthValue > 6) {
                                         BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                         legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1);
                                         legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
-                                legalEvaluate.setProNo(one.getProNo());
+                                        legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo());
-                                legalEvaluate.setProCode(one.getProCode());
+                                        legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode());
-                                legalEvaluate.setCycle((year+i) + "-" + 1 + "至" +(year+i) + "-" + 3);
+                                        legalEvaluate.setCycle(dayOfYear + "-" + 1 + "至" + dayOfYear + "-" + 3);
                                         BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                         if (ObjectUtil.isEmpty(byId)) {
                                             legalEvaluate.setEvaluateStatus("0");
                                         }
                                         bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
                                         legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2);
-                                legalEvaluate.setCycle((year+i)+ "-" + 4 + "至" + (year+i) + "-" + 6);
+                                        legalEvaluate.setCycle(dayOfYear + "-" + 4 + "至" + dayOfYear + "-" + 6);
                                         BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                         if (ObjectUtil.isEmpty(byId1)) {
                                             legalEvaluate.setEvaluateStatus("0");
                                         }
                                         bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
                                         legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3);
-                                legalEvaluate.setCycle((year+i) + "-" + 7 + "至" + (year+i) + "-" + 9);
+                                        legalEvaluate.setCycle(dayOfYear + "-" + 7 + "至" + dayOfYear + "-" + 9);
                                         BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                         if (ObjectUtil.isEmpty(byId2)) {
                                             legalEvaluate.setEvaluateStatus("0");
@@ -608,30 +714,30 @@ public class evaluateTask {
                                         BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                         legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1);
                                         legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
-                                legalEvaluate.setProNo(one.getProNo());
+                                        legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo());
-                                legalEvaluate.setProCode(one.getProCode());
+                                        legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode());
-                                legalEvaluate.setCycle((year+i) + "-" + 1 + "至" + (year+i) + "-" + 3);
+                                        legalEvaluate.setCycle(dayOfYear + "-" + 1 + "至" + dayOfYear + "-" + 3);
                                         BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                         if (ObjectUtil.isEmpty(byId)) {
                                             legalEvaluate.setEvaluateStatus("0");
                                         }
                                         bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
                                         legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2);
-                                legalEvaluate.setCycle((year+i) + "-" + 4 + "至" + (year+i) + "-" + 6);
+                                        legalEvaluate.setCycle(dayOfYear + "-" + 4 + "至" + dayOfYear + "-" + 6);
                                         BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                         if (ObjectUtil.isEmpty(byId1)) {
                                             legalEvaluate.setEvaluateStatus("0");
                                         }
                                         bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
                                         legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3);
-                                legalEvaluate.setCycle((year+i) + "-" + 7 + "至" + (year+i) + "-" + 9);
+                                        legalEvaluate.setCycle(dayOfYear + "-" + 7 + "至" + dayOfYear + "-" + 9);
                                         BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                         if (ObjectUtil.isEmpty(byId2)) {
                                             legalEvaluate.setEvaluateStatus("0");
                                         }
                                         bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
                                         legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4);
-                                legalEvaluate.setCycle((year+i) + "-" + 10 + "至" + (year+i) + "-" + 12);
+                                        legalEvaluate.setCycle(dayOfYear + "-" + 10 + "至" + dayOfYear + "-" + 12);
                                         BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                         if (ObjectUtil.isEmpty(byId3)) {
                                             legalEvaluate.setEvaluateStatus("0");
@@ -640,13 +746,13 @@ public class evaluateTask {
                                     }
                                 }
                             } else {
-                            for (int j = 1,i1=1; j <= 10; j = j + 3,i++) {
+                                for (int j = 1, i1 = 1; j <= 10; j = j + 3, i1++) {
                                     BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate();
                                     legalEvaluate.setLegalPerson(bs.getProjectUnitLegal());
-                                legalEvaluate.setProNo(one.getProNo());
+                                    legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo());
-                                legalEvaluate.setProCode(one.getProCode());
+                                    legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode());
                                     legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + i1);
-                                legalEvaluate.setCycle((year + i-1) + "-" + j + "至" + (year + i-1) + "-" + (j + 2));
+                                    legalEvaluate.setCycle((year + i) + "-" + j + "至" + (year + i) + "-" + (j + 2));
                                     BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId());
                                     if (ObjectUtil.isEmpty(byId3)) {
                                         legalEvaluate.setEvaluateStatus("0");
@@ -654,7 +760,9 @@ public class evaluateTask {
                                     bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate);
                                 }
                             }
-                }}
+                        }
+                    }
+                }
             });
         }
 

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiDedicatedAccountController.java

@@ -6,8 +6,11 @@ import java.util.List;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.controller.BaseController;
+import com.jianwei.common.core.domain.ConditionView;
 import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.utils.StringUtils;
 import com.jianwei.common.utils.poi.ExcelUtil;
 import com.kms.build.domain.BsSgcJsjdBuiGzbzj;
 import com.kms.build.mapper.BsSgcJsjdBuiGzbzjMapper;
@@ -61,7 +64,16 @@ public class BsSgcJsjdBuiDedicatedAccountController extends BaseController
     @ApiOperation("农民工工资专用账户列表")
     public IPage list(@RequestBody SearchParam<BsSgcJsjdBuiDedicatedAccount> sp)
     {
-        IPage<BsSgcJsjdBuiDedicatedAccount> iPage = bsSgcJsjdBuiDedicatedAccountService.selectPage(sp);
+        ConditionView cv = new ConditionView("dedicatedAccounts",sp.getData().getDedicatedAccounts(),"like");
+        sp.setCv(cv);
+        sp.getData().setDedicatedAccounts(null);
+
+        QueryWrapper wrapper = BeanToWrapper.getWrapper(sp);
+        if (StringUtils.isEmpty(sp.getData().getProCode())){
+            wrapper.isNull("pro_code");
+        }
+        IPage iPage = bsSgcJsjdBuiDedicatedAccountService.getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper);
+
         List<BsSgcJsjdBuiDedicatedAccount> records = iPage.getRecords();
         List<BsSgcJsjdBuiDedicatedAccount> list=new ArrayList<>();
         for (BsSgcJsjdBuiDedicatedAccount bs:records){

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiGzbzjController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jianwei.common.core.controller.BaseController;
 import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.utils.StringUtils;
 import com.jianwei.common.utils.poi.ExcelUtil;
 import com.kms.build.domain.BsSgcJsjdBuiDedicatedAccount;
 import com.kms.build.domain.BsSgcJsjdBuiGzbzj;

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiRealNameController.java

@@ -10,6 +10,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.jianwei.common.core.controller.BaseController;
+import com.jianwei.common.core.domain.ConditionView;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.core.domain.entity.SysDictData;
 import com.jianwei.common.utils.StringUtils;
@@ -63,6 +64,7 @@ public class BsSgcJsjdBuiRealNameController extends BaseController
     @ApiOperation("农民工人员实名制信息列表")
     public IPage list(@RequestBody SearchParam<BsSgcJsjdBuiRealName> sp)
     {
+
         return bsSgcJsjdBuiRealNameService.selectPage(sp);
     }
 

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSourceFundsController.java

@@ -246,7 +246,6 @@ public class BsSgcJsjdBuiSourceFundsController extends BaseController {
         //获取项目基本信息
         QueryWrapper<BsSgcjsjdBuiProInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("pro_No", bsSgcJsjdBuiSourceFunds.getProNo());
-        queryWrapper.eq("pro_Code", bsSgcJsjdBuiSourceFunds.getProCode());
         BsSgcjsjdBuiProInfo proInfo = bsSgcjsjdBuiProInfoService.getOne(queryWrapper);
 
 
@@ -258,7 +257,6 @@ public class BsSgcJsjdBuiSourceFundsController extends BaseController {
 
         QueryWrapper<BsSgcJsjdBuiSourceFunds> fundsQueryWrapper = new QueryWrapper<>();
         fundsQueryWrapper.eq("pro_No", bsSgcJsjdBuiSourceFunds.getProNo());
-        fundsQueryWrapper.eq("pro_Code", bsSgcJsjdBuiSourceFunds.getProCode());
         List<BsSgcJsjdBuiSourceFunds> funds = bsSgcJsjdBuiSourceFundsService.list(fundsQueryWrapper);
 
         BigDecimal totalFunds = new BigDecimal(0);
@@ -325,7 +323,6 @@ public class BsSgcJsjdBuiSourceFundsController extends BaseController {
         UpdateWrapper<BsSgcjsjdBuiProInfo> updateWrapper = new UpdateWrapper<>();
         updateWrapper.set("release_funds", subtract);
         updateWrapper.eq("pro_No", bsSgcJsjdBuiSourceFunds.getProNo());
-        updateWrapper.eq("pro_Code", bsSgcJsjdBuiSourceFunds.getProCode());
         bsSgcjsjdBuiProInfoService.update(updateWrapper);
 
 
@@ -354,7 +351,6 @@ public class BsSgcJsjdBuiSourceFundsController extends BaseController {
         String proCode = funds.getProCode();
         QueryWrapper<BsSgcjsjdBuiProInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("pro_No", proNo);
-        queryWrapper.eq("pro_Code", proCode);
         BsSgcjsjdBuiProInfo proInfo = bsSgcjsjdBuiProInfoService.getOne(queryWrapper);
         proInfo.setReleaseFunds(proInfo.getReleaseFunds().subtract(subTotal));
 

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdTransmit.java

@@ -0,0 +1,46 @@
+package com.kms.build.controller;
+
+
+import com.jianwei.common.core.controller.BaseController;
+import com.jianwei.common.core.domain.AjaxResult;
+import com.jianwei.common.core.domain.entity.SysUser;
+import com.kms.build.domain.BsSgcjsjdBuiProInfo;
+import com.kms.build.domain.TransmissionType;
+import com.kms.build.domain.TransmitDto;
+import com.kms.build.service.BsSgcJsjdTransmitService;
+import com.kms.system.service.SysUserService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/transmit")
+public class BsSgcJsjdTransmit extends BaseController {
+
+    @Autowired
+    BsSgcJsjdTransmitService bsSgcJsjdTransmitService;
+
+    @PostMapping
+    public AjaxResult transmit(@RequestBody TransmitDto transmit){
+        if (!transmit.getToken().equals("Sgc@2024")){
+            return AjaxResult.error("令牌不正确");
+
+        }
+
+        if (transmit.getTransmissionType().equals("proInfo")){
+             return bsSgcJsjdTransmitService.proInfoTransmit(transmit);
+        }
+
+
+
+        return AjaxResult.error();
+    }
+
+}
+
+
+
+

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealName.java

@@ -1,6 +1,9 @@
 package com.kms.build.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -81,6 +84,7 @@ public class BsSgcJsjdBuiRealName extends BaseEntity
     private String updateUid;
 
     /** $column.columnComment */
+    @TableField(value = "pro_code", select = true)
     private String proCode;
 
     /** $column.columnComment */

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealNamePro.java

@@ -33,8 +33,8 @@ public class BsSgcJsjdBuiRealNamePro extends BaseEntity
     private String sectionName;
 
     /** 项目编码 */
-    @Excel(name = "项目编码")
+    @Excel(name = "标段项目的id")
-    @ApiModelProperty("项目编码")
+    @ApiModelProperty("标段项目的id")
     private String proCode;
 
     /** 行政区划 */
@@ -47,6 +47,7 @@ public class BsSgcJsjdBuiRealNamePro extends BaseEntity
     @ApiModelProperty("是否有项目书审批")
     private String isApproval;
 
+
     /** $column.columnComment */
     @Excel(name = "是否有项目书审批")
     @ApiModelProperty("是否有项目书审批")

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiUnpaidWages.java

@@ -41,6 +41,8 @@ public class BsSgcJsjdBuiUnpaidWages extends BaseEntity
     @ApiModelProperty("项目号")
     private String proNo;
 
+    private String proCode;
+
     /** 欠薪金额 */
     @Excel(name = "欠薪金额")
     @ApiModelProperty("欠薪金额")

jwtech-system/src/main/java/com/kms/build/domain/TransmissionType.java

@@ -0,0 +1,15 @@
+package com.kms.build.domain;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum TransmissionType {
+   ProInfo("proInfo",new BsSgcjsjdBuiProInfo(),"shui_pro.bs_sgc_jsjd_bui_pro_info");
+
+    private String type;
+    private Object object;
+    private String tableName;
+}

jwtech-system/src/main/java/com/kms/build/domain/TransmitDto.java

@@ -0,0 +1,16 @@
+package com.kms.build.domain;
+
+
+import lombok.Data;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+@Data
+public class TransmitDto {
+    String token;
+    String TransmissionType;
+    Boolean isList;
+    Object data;
+    List<LinkedHashMap<String, Object>> list;
+}

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiAttendanceInformationService.java

@@ -1,5 +1,12 @@
 package com.kms.build.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.jianwei.common.utils.StringUtils;
+import com.kms.build.domain.BsSgcJsjdBuiRealName;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 import com.kms.build.mapper.BsSgcJsjdBuiAttendanceInformationMapper;
@@ -13,5 +20,11 @@ import com.kms.build.domain.BsSgcJsjdBuiAttendanceInformation;
  */
 @Service
 public class BsSgcJsjdBuiAttendanceInformationService extends BaseService<BsSgcJsjdBuiAttendanceInformationMapper, BsSgcJsjdBuiAttendanceInformation>{
-
+    public IPage<BsSgcJsjdBuiAttendanceInformation> selectPage(SearchParam<BsSgcJsjdBuiAttendanceInformation> sp){
+        QueryWrapper wrapper = BeanToWrapper.getWrapper(sp);
+        if (StringUtils.isEmpty(sp.getData().getProCode())){
+            wrapper.isNull("pro_code");
+        }
+        return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper );
+    }
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java

@@ -39,7 +39,6 @@ public class BsSgcJsjdBuiEnteInfoService extends BaseService<BsSgcJsjdBuiEnteInf
         QueryWrapper<BsSgcjsjdBuiProInfo> proInfoQueryWrapper = new QueryWrapper<>();
 
         proInfoQueryWrapper.eq(proNo != null, "pro_no", proNo);
-
         BsSgcjsjdBuiProInfo proInfo = bsSgcjsjdBuiProInfoMapper.selectOne(proInfoQueryWrapper);
 
 
@@ -50,7 +49,7 @@ public class BsSgcJsjdBuiEnteInfoService extends BaseService<BsSgcJsjdBuiEnteInf
         List<BsSgcJsjdBuiEnteInfo> bsSgcJsjdBuiEnteInfos = bsSgcJsjdBuiEnteInfoMapper.selectList(queryWrapper);
 
 
-        if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiEnteInfos)) {
+        if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiEnteInfos)&&ObjectUtil.isNotEmpty(proInfo)) {
             proInfo.setEnterpriseInfoList(bsSgcJsjdBuiEnteInfos);
         }
         return AjaxResult.success(proInfo);

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGckzfdbService.java

@@ -1,6 +1,13 @@
 package com.kms.build.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.jianwei.common.utils.StringUtils;
 import com.kms.build.domain.BsSgcJsjdBuiGckzfdb;
+import com.kms.build.domain.BsSgcJsjdBuiSalaryEnsure;
 import com.kms.build.mapper.BsSgcJsjdBuiGckzfdbMapper;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
@@ -14,5 +21,11 @@ import com.jianwei.common.core.service.BaseService;
  */
 @Service
 public class BsSgcJsjdBuiGckzfdbService extends BaseService<BsSgcJsjdBuiGckzfdbMapper, BsSgcJsjdBuiGckzfdb>{
-
+    public IPage<BsSgcJsjdBuiGckzfdb> selectPage(SearchParam<BsSgcJsjdBuiGckzfdb> sp){
+        QueryWrapper wrapper = BeanToWrapper.getWrapper(sp);
+        if (StringUtils.isEmpty(sp.getData().getProjectCode())){
+            wrapper.isNull("PROJECT_CODE");
+        }
+        return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper );
+    }
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java

@@ -10,11 +10,9 @@ import com.github.pagehelper.PageInfo;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.core.domain.entity.SysDept;
 import com.jianwei.common.core.domain.entity.SysUser;
-import com.kms.build.domain.BsSgcJsjdBuiSalaryEnsure;
+import com.kms.build.domain.*;
-import com.kms.build.domain.BsSgcjsjdBuiProInfo;
 import com.kms.build.domain.dto.GzjbDto;
-import com.kms.build.mapper.BsSgcJsjdBuiSalaryEnsureMapper;
+import com.kms.build.mapper.*;
-import com.kms.build.mapper.BsSgcjsjdBuiProInfoMapper;
 import com.kms.common.utils.UserUtils;
 import com.kms.earlyStage.mapper.BsSlgcQqjdLybzjMapper;
 import com.kms.earlyStage.mapper.BsSlgcQqjdTbbzjMapper;
@@ -25,8 +23,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
-import com.kms.build.mapper.BsSgcJsjdBuiGzjbMapper;
-import com.kms.build.domain.BsSgcJsjdBuiGzjb;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -64,6 +60,12 @@ public class BsSgcJsjdBuiGzjbService extends BaseService<BsSgcJsjdBuiGzjbMapper,
     @Autowired
     BsSlgcQqjdZlbzjMapper bsSlgcQqjdZlbzjMapper;
 
+    @Autowired
+    BsSgcJsjdBuiConstrMeasMapper bsSgcJsjdBuiConstrMeasMapper;
+
+    @Autowired
+    BsSgcJsjdBuiComAccMapper bsSgcJsjdBuiComAccMapper;
+
     public IPage listById(SearchParam<BsSgcJsjdBuiGzjb> sp) {
 
         SysUser sysUser = UserUtils.getUser();
@@ -96,6 +98,28 @@ public class BsSgcJsjdBuiGzjbService extends BaseService<BsSgcJsjdBuiGzjbMapper,
             }else {
                 gz.setSalaryEnsureStatus("0");
             }
+
+            LambdaQueryWrapper<BsSgcJsjdBuiConstrMeas>cmLw=new LambdaQueryWrapper<>();
+            List<BsSgcJsjdBuiConstrMeas> bsSgcJsjdBuiConstrMeas = bsSgcJsjdBuiConstrMeasMapper.selectList(cmLw
+                    .eq(BsSgcJsjdBuiConstrMeas::getProNo, gz.getProNo()).orderByAsc(BsSgcJsjdBuiConstrMeas::getApprovalTime1));
+            if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiConstrMeas)){
+                gz.setIsStart("1");
+                gz.setStartTime(bsSgcJsjdBuiConstrMeas.get(0).getApprovalTime1());
+            }else {
+                gz.setIsStart("0");
+            }
+
+            LambdaQueryWrapper<BsSgcJsjdBuiComAcc>accLw=new LambdaQueryWrapper<>();
+            List<BsSgcJsjdBuiComAcc>bsSgcJsjdBuiComAccs=bsSgcJsjdBuiComAccMapper.selectList(accLw
+                    .eq(BsSgcJsjdBuiComAcc::getProNo,gz.getProNo())
+                    .eq(BsSgcJsjdBuiComAcc::getSectionName,gz.getProjectName()));
+            if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiComAccs)){
+                gz.setIsEnd("1");
+                gz.setEndTime(bsSgcJsjdBuiComAccs.get(0).getCompletionAcceptanceTime());
+            }else {
+                gz.setIsEnd("0");
+            }
+
             gzjb.add(gz);
         }
         Page<GzjbDto> page = new Page<>();

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiLaborManagementService.java

@@ -1,5 +1,12 @@
 package com.kms.build.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.jianwei.common.utils.StringUtils;
+import com.kms.build.domain.BsSgcJsjdBuiPublicity;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 import com.kms.build.mapper.BsSgcJsjdBuiLaborManagementMapper;
@@ -13,5 +20,11 @@ import com.kms.build.domain.BsSgcJsjdBuiLaborManagement;
  */
 @Service
 public class BsSgcJsjdBuiLaborManagementService extends BaseService<BsSgcJsjdBuiLaborManagementMapper, BsSgcJsjdBuiLaborManagement>{
-
+    public IPage<BsSgcJsjdBuiLaborManagement> selectPage(SearchParam<BsSgcJsjdBuiLaborManagement> sp){
+        QueryWrapper wrapper = BeanToWrapper.getWrapper(sp);
+        if (StringUtils.isEmpty(sp.getData().getProCode())){
+            wrapper.isNull("pro_code");
+        }
+        return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper );
+    }
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProjectManagementService.java

@@ -2,10 +2,12 @@ package com.kms.build.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.jianwei.common.utils.StringUtils;
 import com.kms.build.domain.BsSgcJsjdBuiAttendanceConstruction;
 import com.kms.build.mapper.BsSgcJsjdBuiAttendanceConstructionMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +31,12 @@ public class BsSgcJsjdBuiProjectManagementService extends BaseService<BsSgcJsjdB
     BsSgcJsjdBuiAttendanceConstructionMapper bsSgcJsjdBuiAttendanceConstructionMapper;
 
     public IPage<BsSgcJsjdBuiProjectManagement> selectPage1(SearchParam<BsSgcJsjdBuiProjectManagement> sp){
-        Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
+        QueryWrapper wrapper = BeanToWrapper.getWrapper(sp);
+        if (StringUtils.isEmpty(sp.getData().getProCode())){
+            wrapper.isNull("pro_code");
+        }
+
+        Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper);
         List<BsSgcJsjdBuiProjectManagement>records = page.getRecords();
         List<BsSgcJsjdBuiProjectManagement>bsSgcJsjdBuiProjectManagements=new ArrayList<>();
         for (BsSgcJsjdBuiProjectManagement bs:records){

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiPublicityService.java

@@ -1,6 +1,13 @@
 package com.kms.build.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.jianwei.common.utils.StringUtils;
 import com.kms.build.domain.BsSgcJsjdBuiPublicity;
+import com.kms.build.domain.BsSgcJsjdBuiSalaryEnsure;
 import com.kms.build.mapper.BsSgcJsjdBuiPublicityMapper;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
@@ -14,5 +21,11 @@ import com.jianwei.common.core.service.BaseService;
  */
 @Service
 public class BsSgcJsjdBuiPublicityService extends BaseService<BsSgcJsjdBuiPublicityMapper, BsSgcJsjdBuiPublicity>{
-
+    public IPage<BsSgcJsjdBuiPublicity> selectPage(SearchParam<BsSgcJsjdBuiPublicity> sp){
+        QueryWrapper wrapper = BeanToWrapper.getWrapper(sp);
+        if (StringUtils.isEmpty(sp.getData().getProCode())){
+            wrapper.isNull("pro_code");
+        }
+        return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper );
+    }
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiRealNameService.java

@@ -1,5 +1,11 @@
 package com.kms.build.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.jianwei.common.utils.StringUtils;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 import com.kms.build.mapper.BsSgcJsjdBuiRealNameMapper;
@@ -13,5 +19,11 @@ import com.kms.build.domain.BsSgcJsjdBuiRealName;
  */
 @Service
 public class BsSgcJsjdBuiRealNameService extends BaseService<BsSgcJsjdBuiRealNameMapper, BsSgcJsjdBuiRealName>{
-
+    public IPage<BsSgcJsjdBuiRealName> selectPage(SearchParam<BsSgcJsjdBuiRealName> sp){
+        QueryWrapper wrapper = BeanToWrapper.getWrapper(sp);
+        if (StringUtils.isEmpty(sp.getData().getProCode())){
+            wrapper.isNull("pro_code");
+        }
+        return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper );
+    }
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSalaryEnsureService.java

@@ -1,5 +1,12 @@
 package com.kms.build.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.jianwei.common.utils.StringUtils;
+import com.kms.build.domain.BsSgcJsjdBuiSalaryPayable;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 import com.kms.build.mapper.BsSgcJsjdBuiSalaryEnsureMapper;
@@ -13,5 +20,11 @@ import com.kms.build.domain.BsSgcJsjdBuiSalaryEnsure;
  */
 @Service
 public class BsSgcJsjdBuiSalaryEnsureService extends BaseService<BsSgcJsjdBuiSalaryEnsureMapper, BsSgcJsjdBuiSalaryEnsure>{
-
+    public IPage<BsSgcJsjdBuiSalaryEnsure> selectPage(SearchParam<BsSgcJsjdBuiSalaryEnsure> sp){
+        QueryWrapper wrapper = BeanToWrapper.getWrapper(sp);
+        if (StringUtils.isEmpty(sp.getData().getProCode())){
+            wrapper.isNull("pro_code");
+        }
+        return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper );
+    }
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSalaryPayableService.java

@@ -1,5 +1,12 @@
 package com.kms.build.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.jianwei.common.utils.StringUtils;
+import com.kms.build.domain.BsSgcJsjdBuiAttendanceInformation;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 import com.kms.build.mapper.BsSgcJsjdBuiSalaryPayableMapper;
@@ -13,5 +20,11 @@ import com.kms.build.domain.BsSgcJsjdBuiSalaryPayable;
  */
 @Service
 public class BsSgcJsjdBuiSalaryPayableService extends BaseService<BsSgcJsjdBuiSalaryPayableMapper, BsSgcJsjdBuiSalaryPayable>{
-
+    public IPage<BsSgcJsjdBuiSalaryPayable> selectPage(SearchParam<BsSgcJsjdBuiSalaryPayable> sp){
+        QueryWrapper wrapper = BeanToWrapper.getWrapper(sp);
+        if (StringUtils.isEmpty(sp.getData().getProCode())){
+            wrapper.isNull("pro_code");
+        }
+        return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper );
+    }
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSupervisoryUnitManagementService.java

@@ -2,10 +2,12 @@ package com.kms.build.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.jianwei.common.utils.StringUtils;
 import com.kms.build.domain.BsSgcJsjdBuiAttendanceConstruction;
 import com.kms.build.domain.BsSgcJsjdBuiAttendanceSupervisor;
 import com.kms.build.domain.BsSgcJsjdBuiProjectManagement;
@@ -32,7 +34,12 @@ public class BsSgcJsjdBuiSupervisoryUnitManagementService extends BaseService<Bs
     BsSgcJsjdBuiAttendanceSupervisorMapper bsSgcJsjdBuiAttendanceSupervisorMapper;
 
     public IPage<BsSgcJsjdBuiAttendanceSupervisor> selectPage1(SearchParam<BsSgcJsjdBuiSupervisoryUnitManagement> sp){
-        Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
+        QueryWrapper wrapper = BeanToWrapper.getWrapper(sp);
+        if (StringUtils.isEmpty(sp.getData().getProCode())){
+            wrapper.isNull("pro_code");
+        }
+
+        Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()),wrapper);
         List<BsSgcJsjdBuiSupervisoryUnitManagement> records = page.getRecords();
         List<BsSgcJsjdBuiSupervisoryUnitManagement>bsSgcJsjdBuiSupervisoryUnitManagements=new ArrayList<>();
         for (BsSgcJsjdBuiSupervisoryUnitManagement bs:records){

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiUnpaidWagesService.java

@@ -1,5 +1,12 @@
 package com.kms.build.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.jianwei.common.utils.StringUtils;
+import com.kms.build.domain.BsSgcJsjdBuiLaborManagement;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 import com.kms.build.mapper.BsSgcJsjdBuiUnpaidWagesMapper;
@@ -13,5 +20,11 @@ import com.kms.build.domain.BsSgcJsjdBuiUnpaidWages;
  */
 @Service
 public class BsSgcJsjdBuiUnpaidWagesService extends BaseService<BsSgcJsjdBuiUnpaidWagesMapper, BsSgcJsjdBuiUnpaidWages>{
-
+    public IPage<BsSgcJsjdBuiUnpaidWages> selectPage(SearchParam<BsSgcJsjdBuiUnpaidWages> sp){
+        QueryWrapper wrapper = BeanToWrapper.getWrapper(sp);
+        if (StringUtils.isEmpty(sp.getData().getProCode())){
+            wrapper.isNull("pro_code");
+        }
+        return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper );
+    }
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdTransmitService.java

@@ -0,0 +1,76 @@
+package com.kms.build.service;
+
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.jianwei.common.core.domain.AjaxResult;
+import com.kms.build.domain.BsSgcjsjdBuiProInfo;
+import com.kms.build.domain.TransmitDto;
+import com.kms.common.utils.BaseEntityUtils;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class BsSgcJsjdTransmitService {
+
+    @Autowired
+    BsSgcjsjdBuiProInfoService bsSgcjsjdBuiProInfoService;
+
+    public static <T> List<T> convertList(List<LinkedHashMap<String, Object>> sourceList, Class<T> targetClass) {
+        List<T> targetList = new ArrayList<>();
+        if (sourceList == null || sourceList.isEmpty()) {
+            return targetList;
+        }
+        try {
+            for (LinkedHashMap<String, Object> map : sourceList) {
+                T targetObj = targetClass.getDeclaredConstructor().newInstance();
+                for (Map.Entry<String, Object> entry : map.entrySet()) {
+                    String key = entry.getKey();
+                    Object value = entry.getValue();
+                    try {
+                        String setterMethod = "set" + Character.toUpperCase(key.charAt(0)) + key.substring(1);
+                        targetClass.getMethod(setterMethod, value.getClass()).invoke(targetObj, value);
+                    } catch (NoSuchMethodException e) {
+                        // Skip if there's no matching setter
+                    }
+                }
+                targetList.add(targetObj);
+            }
+        } catch (Exception e) {
+            e.printStackTrace(); // 打印异常信息
+        }
+        return targetList;
+    }
+
+
+    public AjaxResult proInfoTransmit(TransmitDto transmitDto){
+        boolean b=false;
+        Boolean type=transmitDto.getIsList();
+
+        if (type){
+            List<BsSgcjsjdBuiProInfo> bsSgcjsjdBuiProInfos = this.convertList(transmitDto.getList(), BsSgcjsjdBuiProInfo.class);
+            for (BsSgcjsjdBuiProInfo bs:bsSgcjsjdBuiProInfos){
+                BaseEntityUtils.preInsert(bs);
+            }
+          b = bsSgcjsjdBuiProInfoService.saveBatch(bsSgcjsjdBuiProInfos);
+        }
+        if (!type){
+            BsSgcjsjdBuiProInfo data = (BsSgcjsjdBuiProInfo) transmitDto.getData();
+            BaseEntityUtils.preInsert(data);
+            b=bsSgcjsjdBuiProInfoService.save(data);
+        }
+
+        if (b){
+            return AjaxResult.success("传输成功");
+        }else {
+            return AjaxResult.error("传输失败");
+        }
+    }
+}

jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java

@@ -36,6 +36,7 @@ import lombok.Data;
 import org.apache.ibatis.reflection.wrapper.BaseWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
 import java.time.Period;
@@ -157,13 +158,52 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         if (sysUser.getUserType().equals("01")){
             List<BsSgcJsjdBuiSectionInfo> bsSgcJsjdBuiSectionInfos = bsSgcJsjdBuiSectionInfoMapper.getByUser(sysUser.getDeptId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
                     "create_time", sp.getPageNum(), sp.getPageSize(), sp.getData().getProNo(), null);
+            List<BsSgcjsjdBuiProInfo>bsSgcjsjdBuiProInfos=bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getDeptId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
+                    null,
+                    "create_time", sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),null,isMajor);
+            List<BsSgcjsjdBuiProInfo>bsSgcjsjdBuiProInfoList=new ArrayList<>();
             if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiSectionInfos)){
             for (BsSgcJsjdBuiSectionInfo bs:bsSgcJsjdBuiSectionInfos){
-                list=bsSgcjsjdBuiProInfoMapper.selectList(Wrappers.lambdaQuery(BsSgcjsjdBuiProInfo.class)
+                BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo=bsSgcjsjdBuiProInfoMapper.selectOne(Wrappers.lambdaQuery(BsSgcjsjdBuiProInfo.class)
                         .eq(BsSgcjsjdBuiProInfo::getProNo,bs.getProNo()));
+                    String proNo = bsSgcjsjdBuiProInfo.getProNo();
+                    QueryWrapper<BsSgcJsjdBuiContInfo>queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("pro_no", proNo);
+                    List<BsSgcJsjdBuiContInfo> bsSgcJsjdBuiContInfos =
+                            bsSgcJsjdBuiContInfoService.list(queryWrapper);
+                    BigDecimal contractPayment = BigDecimal.ZERO;
+                    for (BsSgcJsjdBuiContInfo bsSgcJsjdBuiContInfo : bsSgcJsjdBuiContInfos) {
+                        BigDecimal actualPayment = bsSgcJsjdBuiContInfo.getActualPayment();
+                        if (actualPayment == null) {
+                            actualPayment = BigDecimal.ZERO;
+                        }
+                        contractPayment = contractPayment.add(actualPayment);
+                    }
+                  bsSgcjsjdBuiProInfo.setContractPayment(contractPayment);
+                    if (StringUtil.isEmpty(bsSgcjsjdBuiProInfo.getProjectName())||StringUtil.isEmpty(bsSgcjsjdBuiProInfo.getAdcd())||StringUtil.isEmpty(bsSgcjsjdBuiProInfo.getProNo())){
+                        QueryWrapper<SpecialProjectProposal> qw = new QueryWrapper<>();
+                        qw.eq("PROJECT_NAME", bsSgcjsjdBuiProInfo.getProjectName());
+                        SpecialProjectProposal one = specialProjectProposalMapper.selectList(qw).get(0);
 
-                for (BsSgcjsjdBuiProInfo record : list) {
+                        if (ObjectUtil.isNotEmpty(one)) {
-                    String proNo = record.getProNo();
+                            bsSgcjsjdBuiProInfo.setProjectName(one.getProjectName());
+                            bsSgcjsjdBuiProInfo.setAdcd(one.getAdcd());
+                            if (StringUtil.isEmpty(bsSgcjsjdBuiProInfo.getProNo())) {
+                                bsSgcjsjdBuiProInfo.setProNo(one.getProNo());
+                            }
+                        }
+                        if (ObjectUtil.isEmpty(bsSgcjsjdBuiProInfo.getProNo())){
+                            bsSgcjsjdBuiProInfo.setProNo(bsSgcjsjdBuiProInfo.getId());
+                        }
+                        bsSgcjsjdBuiProInfoMapper.updateById(bsSgcjsjdBuiProInfo);
+                    }
+
+                    bsSgcjsjdBuiProInfoList.add(bsSgcjsjdBuiProInfo);
+                 }
+            }
+
+            for (BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo:bsSgcjsjdBuiProInfos){
+                String proNo = bsSgcjsjdBuiProInfo.getProNo();
                 QueryWrapper<BsSgcJsjdBuiContInfo>queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("pro_no", proNo);
                 List<BsSgcJsjdBuiContInfo> bsSgcJsjdBuiContInfos =
@@ -176,31 +216,32 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                     }
                     contractPayment = contractPayment.add(actualPayment);
                 }
-                    record.setContractPayment(contractPayment);
+                bsSgcjsjdBuiProInfo.setContractPayment(contractPayment);
-                    if (StringUtil.isEmpty(record.getProjectName())||StringUtil.isEmpty(record.getAdcd())||StringUtil.isEmpty(record.getProNo())){
+                if (StringUtil.isEmpty(bsSgcjsjdBuiProInfo.getProjectName())||StringUtil.isEmpty(bsSgcjsjdBuiProInfo.getAdcd())||StringUtil.isEmpty(bsSgcjsjdBuiProInfo.getProNo())){
                     QueryWrapper<SpecialProjectProposal> qw = new QueryWrapper<>();
-                        qw.eq("PROJECT_NAME", record.getProjectName());
+                    qw.eq("PROJECT_NAME", bsSgcjsjdBuiProInfo.getProjectName());
                     SpecialProjectProposal one = specialProjectProposalMapper.selectList(qw).get(0);
 
                     if (ObjectUtil.isNotEmpty(one)) {
-                            record.setProjectName(one.getProjectName());
+                        bsSgcjsjdBuiProInfo.setProjectName(one.getProjectName());
-                            record.setAdcd(one.getAdcd());
+                        bsSgcjsjdBuiProInfo.setAdcd(one.getAdcd());
-                            if (StringUtil.isEmpty(record.getProNo())) {
+                        if (StringUtil.isEmpty(bsSgcjsjdBuiProInfo.getProNo())) {
-                                record.setProNo(one.getProNo());
+                            bsSgcjsjdBuiProInfo.setProNo(one.getProNo());
                         }
                     }
-                        if (ObjectUtil.isEmpty(record.getProNo())){
+                    if (ObjectUtil.isEmpty(bsSgcjsjdBuiProInfo.getProNo())){
-                            record.setProNo(record.getId());
+                        bsSgcjsjdBuiProInfo.setProNo(bsSgcjsjdBuiProInfo.getId());
                     }
-                        bsSgcjsjdBuiProInfoMapper.updateById(record);
+                    bsSgcjsjdBuiProInfoMapper.updateById(bsSgcjsjdBuiProInfo);
+                }
+                if (!bsSgcjsjdBuiProInfoList.contains(bsSgcjsjdBuiProInfo)){
+                    bsSgcjsjdBuiProInfoList.add(bsSgcjsjdBuiProInfo);
                 }
             }
             Page<BsSgcjsjdBuiProInfo> page = new Page<>();
-                page.setRecords(list);
+            page.setRecords(bsSgcjsjdBuiProInfoList);
             return page;
 }
-            }
-}
 
         if (ObjectUtil.isNull(params)) {
             list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getDeptId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
@@ -444,7 +485,8 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         }
         SysDept sysDept = sysDeptService.get(deptId);
         String xzqhId = sysDept.getXzqhId();
-        List<HistogramDto> list = bsSgcjsjdBuiProInfoMapper.getHistogram(user.getId(),user.getUserType(),sysXzqhService.getSubString(xzqhId));
+        List<HistogramDto> list;
+        list = bsSgcjsjdBuiProInfoMapper.getHistogram(user.getId(),user.getUserType(),sysXzqhService.getSubString(xzqhId));
         HashMap<String, Use> map = new HashMap<>();
         for (int i = 0; i < list.size(); i++) {
             Use use = new Use();
@@ -465,17 +507,13 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                         } else {
                             use.setMs(list.get(j).getNum());
                         }
-
                         map.put(list.get(i).getCity(), use);
                     } else {
                         map.put(list.get(i).getCity(), use);
                     }
                  }
-
                }
             }
-
-
         }
         return map;
 
@@ -538,25 +576,32 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
             }
         }
 
-        BsSgcJsjdBuiConstrMeas bsSgcJsjdBuiConstrMeas = bsSgcJsjdBuiConstrMeasMapper.selectOne(new QueryWrapper<BsSgcJsjdBuiConstrMeas>()
+        List<BsSgcJsjdBuiConstrMeas> bsSgcJsjdBuiConstrMeas = bsSgcJsjdBuiConstrMeasMapper.selectList(new QueryWrapper<BsSgcJsjdBuiConstrMeas>()
-                .eq("pro_no", sp.getData().getProNo()).eq("section_name",bsSgcjsjdBuiProInfo.getProjectName()));
+                .eq("pro_no", sp.getData().getProNo()).eq("section_name", bsSgcjsjdBuiProInfo.getProjectName()).orderByAsc("approval_time1"));
-        if (!ObjectUtil.isEmpty(bsSgcJsjdBuiConstrMeas)) {
+        if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiConstrMeas)) {
-            if (!ObjectUtil.isEmpty(bsSgcJsjdBuiConstrMeas.getReportTime1())) {
+            if (!ObjectUtil.isEmpty(bsSgcJsjdBuiConstrMeas.get(0).getReportTime1())) {
-                stageStatistics.setPreliminaryApprovalDate(bsSgcJsjdBuiConstrMeas.getReportTime1());
+                stageStatistics.setPreliminaryApprovalDate(bsSgcJsjdBuiConstrMeas.get(0).getReportTime1());
                 stageStatistics.setCurrentStage("0");
             }
         }
 
-        BsSgcJsjdBuiComAcc bsSgcJsjdBuiComAcc = bsSgcJsjdBuiComAccMapper.selectOne(new QueryWrapper<BsSgcJsjdBuiComAcc>()
+        List<BsSgcJsjdBuiComAcc> bsSgcJsjdBuiComAccs = bsSgcJsjdBuiComAccMapper.selectList(new QueryWrapper<BsSgcJsjdBuiComAcc>()
-                .eq("pro_no", sp.getData().getProNo()));
+                .eq("pro_no", sp.getData().getProNo()).eq("type", "1")
-        if (!ObjectUtil.isEmpty(bsSgcJsjdBuiComAcc)) {
+                .eq("PROJECT_NAME", sp.getData().getProjectName()));
-            if (!ObjectUtil.isEmpty(bsSgcJsjdBuiComAcc.getContractAcceptTime())) {
+
-                stageStatistics.setProjectCompletedDate(bsSgcJsjdBuiComAcc.getContractAcceptTime());
+                List<BsSgcJsjdBuiComAcc> bsSgcJsjdBuiConAccs = bsSgcJsjdBuiComAccMapper.selectList(new QueryWrapper<BsSgcJsjdBuiComAcc>()
+                        .eq("pro_no", sp.getData().getProNo()).eq("type", "0")
+                .eq("PROJECT_NAME", sp.getData().getProjectName()));
+
+        if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiConAccs)) {
+            if (!ObjectUtil.isEmpty(bsSgcJsjdBuiConAccs.get(0).getContractAcceptTime())) {
+                stageStatistics.setProjectCompletedDate(bsSgcJsjdBuiConAccs.get(0).getContractAcceptTime());
                 stageStatistics.setCurrentStage("2");
             }
-
+        }
-            if (!ObjectUtil.isEmpty(bsSgcJsjdBuiComAcc.getContractAcceptTime())) {
+        if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiComAccs)){
-                stageStatistics.setCompletionAcceptanceDate(bsSgcJsjdBuiComAcc.getContractAcceptTime());
+            if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiComAccs.get(0).getCompletionAcceptanceTime())){
+                stageStatistics.setCompletionAcceptanceDate(bsSgcJsjdBuiComAccs.get(0).getCompletionAcceptanceTime());
                 stageStatistics.setCurrentStage("3");
             }
         }

jwtech-system/src/main/java/com/kms/build/service/FileService.java

@@ -17,8 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
 
 @Service
 public class FileService extends BaseService<FileMapper, FileDto> {
@@ -32,8 +31,16 @@ public class FileService extends BaseService<FileMapper, FileDto> {
 
         FileDto fileDto=fileMapper.fileList(proNo, proCode);
         List<FileResponseDto> fileResponseDtos = handleFileList(fileDto);
-
+        LinkedHashSet<FileResponseDto>set=new LinkedHashSet<>();
-       for (int i=1;i<=fileResponseDtos.size();i++){
+        Map<String,FileResponseDto>map=new HashMap<>();
+        for (FileResponseDto fileResponseDto:fileResponseDtos){
+            map.put(fileResponseDto.getFileUrl(),fileResponseDto);
+        }
+       List<FileResponseDto>list=new ArrayList<>();
+       map.forEach((String,FileResponseDto)->{
+           list.add(FileResponseDto);
+       });
+        for (int i=1;i<=list.size();i++){
             String num="";
             if (i<10){
                 num=proCode+"-00"+i;
@@ -44,9 +51,10 @@ public class FileService extends BaseService<FileMapper, FileDto> {
             else {
                 num=proCode+"-"+i;
             }
-           fileResponseDtos.get(i-1).setFileNo(num);
+            list.get(i-1).setFileNo(num);
         }
-       return fileResponseDtos;
+
+       return list;
     }
 
 

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java

@@ -64,10 +64,10 @@ public class SpecialProjectFeasibilityService extends BaseService<SpecialProject
 
 
         if (ObjectUtil.isNull(params)) {
-            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(),
+            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getDeptId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(),
                     sysXzqhService.getSubString(data.getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
         }else {
-            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(),
+            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getDeptId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(),
                     sysXzqhService.getSubString(data.getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
         }
 

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java

@@ -18,7 +18,10 @@ import com.kms.build.domain.BsSgcjsjdBuiProInfo;
 import com.kms.build.mapper.BsSgcJsjdBuiSectionInfoMapper;
 import com.kms.common.utils.UserUtils;
 import com.kms.earlyStage.domain.*;
+import com.kms.system.domain.SysUserPro;
+import com.kms.system.mapper.SysUserProMapper;
 import com.kms.system.service.SysDeptService;
+import com.kms.system.service.SysUserProService;
 import com.kms.system.service.SysXzqhService;
 import javafx.print.Collation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -92,10 +95,10 @@ public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPr
         }
 
         if (ObjectUtil.isNull(params)) {
-            list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
+            list = specialProjectPreDesignMapper.getByUserPro(sysUser.getDeptId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
                     sysXzqhService.getSubString(data.getAdcd()),sp.getData().getProjectKind(),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
         }else {
-            list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
+            list = specialProjectPreDesignMapper.getByUserPro(sysUser.getDeptId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
                     sysXzqhService.getSubString(data.getAdcd()),sp.getData().getProjectKind(),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
         }
 
@@ -122,6 +125,9 @@ public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPr
 
     }
 
+    @Autowired
+    SysUserProMapper sysUserProMapper;
+
     public IPage<BsSgcjsjdBuiProInfo> listProject(SearchParam<BsSgcjsjdBuiProInfo> sp) {
         BsSgcjsjdBuiProInfo data = sp.getData();
 
@@ -130,13 +136,13 @@ public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPr
         if (StringUtil.isNotEmpty(user.getUserType())) {
 
             if (user.getUserType().equals("00")) {
-                 page = specialProjectPreDesignMapper.listProject(user.getId(), sysXzqhService.getSubString(data.getAdcd()), data.getProjectName(),
+                 page = specialProjectPreDesignMapper.listProject(user.getDeptId(), sysXzqhService.getSubString(data.getAdcd()), data.getProjectName(),
                         data.getBindStatus(),
                         new Page<>(sp.getPageNum(), sp.getPageSize()));
 
             }
             if (user.getUserType().equals("01")){
-                page = specialProjectPreDesignMapper.listProject(user.getId(), sysXzqhService.getSubString(data.getAdcd()), data.getProjectName(),
+                page = specialProjectPreDesignMapper.listProject(user.getDeptId(), sysXzqhService.getSubString(data.getAdcd()), data.getProjectName(),
                         data.getBindStatus(),
                         new Page<>(sp.getPageNum(), sp.getPageSize()));
                 List<BsSgcjsjdBuiProInfo>records=page.getRecords();
@@ -145,11 +151,24 @@ public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPr
 
                 for (BsSgcjsjdBuiProInfo pd:records){
                     LambdaQueryWrapper<BsSgcJsjdBuiSectionInfo>lw=new LambdaQueryWrapper<>();
+                    List<SysUserPro> userPro = sysUserProMapper.selectList(new QueryWrapper<SysUserPro>().eq("pro_no", pd.getProNo()).eq("user_id", user.getDeptId()));
+                    if (CollUtil.isNotEmpty(userPro)){
+                        pd.setBindStatus("1");
+                    }else {
+                        pd.setBindStatus("0");
+                    }
                     List<BsSgcJsjdBuiSectionInfo> bsSgcJsjdBuiSectionInfos = bsSgcJsjdBuiSectionInfoMapper.selectList(lw.eq(BsSgcJsjdBuiSectionInfo::getProNo, pd.getProNo()));
+                    for (BsSgcJsjdBuiSectionInfo se:bsSgcJsjdBuiSectionInfos){
+                        List<SysUserPro> userPros = sysUserProMapper.selectList(new QueryWrapper<SysUserPro>().eq("section_no", se.getId()).eq("user_id", user.getDeptId()));
+                        if (CollUtil.isNotEmpty(userPros)){
+                            pd.setBindStatus("1");
+                            se.setBindStatus("1");
+                        }else {
+                            se.setBindStatus("0");
+                        }
+                    }
                     if (CollUtil.isNotEmpty(bsSgcJsjdBuiSectionInfos)){
                         pd.setChildren(bsSgcJsjdBuiSectionInfos);
-                    }else {
-                        pd.setChildren(new ArrayList<>());
                     }
                     list.add(pd);
                 }

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java

@@ -55,8 +55,9 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
     public IPage selectPage(SearchParam<SpecialProjectProposal> sp) {
         SysUser sysUser = UserUtils.getUser();
 
+
         SpecialProjectProposal data = sp.getData();
-        if (sysUser.getUserType().equals("00") && data.getAdcd() == null) {
+        if (data.getAdcd() == null) {
             String deptId = sysUser.getDeptId();
             SysDept sysDept = sysDeptService.get(deptId);
             String xzqhId = sysDept.getXzqhId();
@@ -89,10 +90,10 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
 
 
         if (ObjectUtil.isNull(params)) {
-            list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
+            list = specialProjectProposalMapper.getByUserPro(sysUser.getDeptId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
                     data.getProjectCode(),sysXzqhService.getSubString(data.getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()),data.getProjectKind());
         }else {
-            list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
+            list = specialProjectProposalMapper.getByUserPro(sysUser.getDeptId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
                     data.getProjectCode(),sysXzqhService.getSubString(data.getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()),data.getProjectKind());
         }
         return list;

jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml

@@ -239,17 +239,16 @@
     <select id="selectManagePage" resultMap="projectManage">
         <include refid="projectMangeInfo"></include>
         <if test="userType==01">
-            WHERE
             pi.PRO_NO  COLLATE utf8mb4_general_ci IN (
             SELECT
             PRO_NO COLLATE utf8mb4_general_ci
             FROM
             sys_user_pro
             <where>
-                1=1
                 <if test="userId!=null and userId!=''">
                     AND user_id=#{userId})
                 </if>
+                br.pro_code is null
                 <if test="projectName!=null and projectName!=''">
                     and pp.project_name like concat('%',#{projectName},'%')
                 </if>
@@ -265,7 +264,7 @@
         </if>
         <if test="userType==00">
             <where>
-                1=1
+                br.pro_code is null
                 <if test="projectName!=null and projectName!=''">
                     and pi.project_name like concat('%',#{projectName},'%')
                 </if>
@@ -323,7 +322,7 @@
         <result property="farmerTotal" column="totalSum"/>
         <result property="farmerNow" column="currentYearSum"/>
         <result property="farmerYear" column="famerSum2024"/>
-        <result property="zfTotal" column="total"/>
+        <result property="zfTotal" column="zftotal"/>
         <result property="zfLandPaidnAmount" column="landPadinAmount"/>
         <result property="zfCenterPaidinAmount" column="CENTER_PAIDIN_AMOUNT"/>
         <result property="xdTotal" column="source_total"/>
@@ -399,7 +398,7 @@
         sf.source_land,
         pf.landPadinAmount,
         pf.CENTER_PAIDIN_AMOUNT,
-        pf.total,
+        pf.zftotal,
         att.totalSum,
         att.currentYearSum,
         att.famerSum2024
@@ -432,7 +431,7 @@
         ) pbi ON pbi.PRO_NO = info.PRO_NO
         LEFT JOIN (
         SELECT
-        SUM( sf.release_funds ) AS source_total,
+        SUM(sf.PROVINCIAL_FUNDING + sf.CITY_LEVEL_FUNDS + sf.COUNTY_LEVEL_FUNDS + sf.TOWNSHIP_INVESTMENTS+sf.CENTRAL_ARRANGED_FUNDS ) AS source_total,
         SUM( sf.CENTRAL_ARRANGED_FUNDS ) AS source_center,
         SUM( sf.PROVINCIAL_FUNDING + sf.CITY_LEVEL_FUNDS + sf.COUNTY_LEVEL_FUNDS + sf.TOWNSHIP_INVESTMENTS ) AS source_land,
         PRO_NO,
@@ -481,9 +480,9 @@
         att   on att.pro_no=pro.PRO_NO
         LEFT JOIN (
         SELECT
-        SUM(pf.center_paidin_amount) as CENTER_PAIDIN_AMOUNT,
+        ROUND(SUM(pf.center_paidin_amount),2) as CENTER_PAIDIN_AMOUNT,
-        SUM(pf.provincial_paidin_amount+pf.city_paidin_amount+pf.county_paidin_amount+pf.township_paidin_amount) as landPadinAmount,
+        ROUND(SUM(pf.provincial_paidin_amount+pf.city_paidin_amount+pf.county_paidin_amount+pf.township_paidin_amount),2) as landPadinAmount,
-        SUM( pf.center_paidin_amount + pf.provincial_paidin_amount + pf.city_paidin_amount + pf.county_paidin_amount + pf.township_paidin_amount ) total,
+        ROUND(SUM(pf.provincial_paidin_amount+pf.city_paidin_amount+pf.county_paidin_amount+pf.township_paidin_amount+pf.center_paidin_amount),2) as zftotal,
         PRO_NO,
         pro_code,
         CONTRACT_NUMBER
@@ -565,6 +564,7 @@
                 <if test="adcd!=null and adcd !=''">
                     and pi.adcd like concat(#{adcd},'%')
                 </if>
+
             </where>
         </if>
         GROUP BY
@@ -629,10 +629,28 @@
                 FROM sys_user_pro
             <where>
                 <if test="userId!=null and userId!=''">
-                    user_id=#{userId}
+                    user_id=#{userId})
+                </if>
+                <if test="projectName!=null and projectName!=''">
+                    and np.project_name like concat('%',#{projectName},'%')
+                </if>
+                <if test="proCode != null and proCode != ''">
+                    and np.PRO_CODE=#{proCode}
+                </if>
+                <if test="proNo != null and proNo != ''">
+                    and np.PRO_NO=#{proNo}
+                </if>
+                <if test="id!=null and id!=''">
+                    and id=#{id}
+                </if>
+                <if test="isApproval != null and isApproval != ''">
+                    and np.is_approval=#{isApproval}
                 </if>
             </where>
             UNION
+            select id,project_name,section_name,pro_code,adcd,pro_no,is_approval from bs_sgc_jsjd_bui_real_name_pro np
+            WHERE
+            np.pro_code COLLATE utf8mb4_general_ci IN (
             SELECT sys_user_pro.section_no COLLATE utf8mb4_general_ci
             FROM sys_user_pro
             <where>
@@ -648,9 +666,6 @@
                 <if test="proNo != null and proNo != ''">
                     and np.PRO_NO=#{proNo}
                 </if>
-                <if test="adcd!=null and adcd !=''">
-                    and np.adcd like concat(#{adcd},'%')
-                </if>
                 <if test="id!=null and id!=''">
                     and id=#{id}
                 </if>
@@ -658,7 +673,7 @@
                     and np.is_approval=#{isApproval}
                 </if>
             </where>
-            order by np.project_name desc LIMIT #{pageNum},#{pageSize};
+            order by project_name desc LIMIT #{pageNum},#{pageSize};
         </if>
 
         <if test="userType==00">
@@ -688,17 +703,15 @@
 
 
     <select id="getRealNameCount" resultType="java.lang.Integer">
-        select count(*) from bs_sgc_jsjd_bui_real_name_pro np
         <if test="userType==01">
+            select count(*) from bs_sgc_jsjd_bui_real_name_pro np
             WHERE
-            np.pro_code COLLATE utf8mb4_general_ci IN (
+            (np.pro_no COLLATE utf8mb4_general_ci IN (
-            SELECT
+            SELECT sys_user_pro.pro_no COLLATE utf8mb4_general_ci
-            sys_user_pro.section_no COLLATE utf8mb4_general_ci
+            FROM sys_user_pro
-            FROM
-            sys_user_pro
             <where>
                 <if test="userId != null and userId != ''">
-                    AND user_id=#{userId})
+                    user_id=#{userId})
                 </if>
                 <if test="projectName != null and projectName != ''">
                     and np.project_name like concat('%',#{projectName},'%')
@@ -718,10 +731,38 @@
                 <if test="isApproval != null and isApproval != ''">
                     and np.is_approval=#{isApproval}
                 </if>
-            </where>
+            </where>)
+            or
+            (np.pro_code COLLATE utf8mb4_general_ci IN (
+            SELECT sys_user_pro.section_no COLLATE utf8mb4_general_ci
+            FROM sys_user_pro
+            <where>
+                <if test="userId != null and userId != ''">
+                    user_id=#{userId})
+                </if>
+                <if test="projectName != null and projectName != ''">
+                    and np.project_name like concat('%',#{projectName},'%')
+                </if>
+                <if test="proCode != null and proCode != ''">
+                    and np.PRO_CODE=#{proCode}
+                </if>
+                <if test="proNo != null and proNo != ''">
+                    and np.PRO_NO=#{proNo}
+                </if>
+                <if test="adcd != null and adcd != ''">
+                    and np.adcd like concat(#{adcd},'%')
+                </if>
+                <if test="id != null and id != ''">
+                    and id=#{id}
+                </if>
+                <if test="isApproval != null and isApproval != ''">
+                    and np.is_approval=#{isApproval}
+                </if>
+            </where>)
         </if>
 
         <if test="userType==00">
+            select count(*) from bs_sgc_jsjd_bui_real_name_pro np
             <where>
                 <if test="projectName!=null and projectName!=''">
                     and np.project_name like concat('%',#{projectName},'%')

jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml

@@ -98,97 +98,168 @@
         <result property="constructionNature" column="CONSTRUCTION_NATURE"/>
         <result property="total" column="total"/>
         <result property="proNo" column="pro_no"/>
+        <result property="bindStatus" column="bind_status"/>
     </resultMap>
 
     <select id="listProject" resultMap="listProject">
+        SELECT *
+        FROM (
         SELECT DISTINCT
         pi.pro_no,
         pi.project_name,
-        pi.adcd
+        pi.adcd,
+        CASE
+        WHEN EXISTS (
+        SELECT 1
+        FROM sys_user_pro sup
+        WHERE sup.pro_no = pi.pro_no
+        <if test="userId != null and userId != ''">
+            AND sup.user_id = #{userId}
+        </if>
+        ) THEN 1
+        ELSE 0
+        END AS bind_status
         FROM
         bs_sgc_jsjd_bui_pro_info pi
-        LEFT JOIN bs_slgc_qqjd_spe_pro_proposal pp ON pi.pro_code = pp.project_code
+        LEFT JOIN
+        bs_slgc_qqjd_spe_pro_proposal pp ON pi.pro_code = pp.project_code
         AND pi.pro_no = pp.pro_no
         <where>
             1 = 1
-<!--            <if test="adcd!=null and adcd !=''">-->
-<!--                and pi.adcd like concat(#{adcd},'%')-->
-<!--            </if>-->
             <if test="projectName != null and projectName != ''">
-                and pi.project_name like concat('%',#{projectName},'%')
+                AND pi.project_name LIKE CONCAT('%', #{projectName}, '%')
-            </if>
+            </if>
-<!--            <if test="userId!=null and userId!=''">-->
+            <if test="adcd != null and adcd != ''">
-<!--                and (pi.PRO_NO IN (-->
+                and pi.adcd like concat(#{adcd},'%')
-<!--                SELECT-->
+            </if>
-<!--                PRO_NO-->
+        </where>
-<!--                FROM-->
+        GROUP BY
-<!--                sys_user_pro-->
+        pi.pro_no, pi.project_name, pi.adcd
-<!--                where-->
+        ) AS subquery
-<!--                user_id = #{userId}) or-->
+        <where>
-<!--                bind_status = 0)-->
+            1 = 1
-<!--            </if>-->
+            <if test="bindStatus != null and bindStatus != ''">
+                AND bind_status = #{bindStatus}
+            </if>
         </where>
-        group by pi.pro_no
 
         UNION
 
+        SELECT *
+        FROM (
         SELECT DISTINCT
         pp.pro_no,
-        pp.PROJECT_NAME as project_name,
+        pp.project_name,
-        pp.adcd
+        pp.adcd,
+        CASE
+        WHEN EXISTS (
+        SELECT 1
+        FROM sys_user_pro sup
+        WHERE sup.pro_no = pp.pro_no
+        <if test="userId != null and userId != ''">
+            AND sup.user_id = #{userId}
+        </if>
+
+        ) THEN 1
+        ELSE 0
+        END AS bind_status
         FROM
         bs_slgc_qqjd_spe_pro_proposal pp
-
         <where>
             1 = 1
-            <!--            <if test="adcd!=null and adcd !=''">-->
-            <!--                and pi.adcd like concat(#{adcd},'%')-->
-            <!--            </if>-->
             <if test="projectName != null and projectName != ''">
-                and pp.PROJECT_NAME like concat('%',#{projectName},'%')
+                AND pp.project_name LIKE CONCAT('%', #{projectName}, '%')
-            </if>
+            </if>
-            <!--            <if test="userId!=null and userId!=''">-->
+            <if test="adcd != null and adcd != ''">
-            <!--                and (pi.PRO_NO IN (-->
+                and pp.adcd like concat(#{adcd},'%')
-            <!--                SELECT-->
+            </if>
-            <!--                PRO_NO-->
+        </where>
-            <!--                FROM-->
+        GROUP BY
-            <!--                sys_user_pro-->
+        pp.pro_no, pp.project_name, pp.adcd
-            <!--                where-->
+        ) AS subquery
-            <!--                user_id = #{userId}) or-->
+        <where>
-            <!--                bind_status = 0)-->
+            1 = 1
-            <!--            </if>-->
+            <if test="bindStatus != null and bindStatus != ''">
+                AND bind_status = #{bindStatus}
+            </if>
         </where>
-        group by pp.pro_no
 
         UNION
+        SELECT *
+        FROM (
         SELECT DISTINCT
         fea.pro_no,
-        fea.PROJECT_NAME as project_name,
+        fea.project_name,
-        fea.adcd
+        fea.adcd,
+        CASE
+        WHEN EXISTS (
+        SELECT 1
+        FROM sys_user_pro sup
+        WHERE sup.pro_no = fea.pro_no
+        <if test="userId != null and userId != ''">
+            AND sup.user_id = #{userId}
+        </if>
+        ) THEN 1
+        ELSE 0
+        END AS bind_status
         FROM
         bs_slgc_qqjd_spe_pro_fea fea
-
         <where>
             1 = 1
             <if test="projectName != null and projectName != ''">
-                and fea.PROJECT_NAME like concat('%',#{projectName},'%')
+                AND fea.project_name LIKE CONCAT('%', #{projectName}, '%')
+            </if>
+            <if test="adcd != null and adcd != ''">
+                and fea.adcd like concat(#{adcd},'%')
+            </if>
+        </where>
+        GROUP BY
+        fea.pro_no, fea.project_name, fea.adcd
+        ) AS subquery
+        <where>
+            1 = 1
+            <if test="bindStatus != null and bindStatus != ''">
+                AND bind_status = #{bindStatus}
             </if>
         </where>
-        group by fea.pro_no
 
         UNION
+        SELECT *
+        FROM (
         SELECT DISTINCT
         app.pro_no,
-        app.project_name as project_name,
+        app.project_name,
-        app.adcd
+        app.adcd,
+        CASE
+        WHEN EXISTS (
+        SELECT 1
+        FROM sys_user_pro sup
+        WHERE sup.pro_no = app.pro_no
+        <if test="userId != null and userId != ''">
+            AND sup.user_id = #{userId}
+        </if>
+        ) THEN 1
+        ELSE 0
+        END AS bind_status
         FROM
         bs_sgc_qqjd_spe_pro_des_app app
         <where>
             1 = 1
             <if test="projectName != null and projectName != ''">
-                and app.PROJECT_NAME like concat('%',#{projectName},'%')
+                AND app.project_name LIKE CONCAT('%', #{projectName}, '%')
+            </if>
+            <if test="adcd != null and adcd != ''">
+                and app.adcd like concat(#{adcd},'%')
+            </if>
+        </where>
+        GROUP BY
+        app.pro_no, app.project_name, app.adcd
+        ) AS subquery
+        <where>
+            1 = 1
+            <if test="bindStatus != null and bindStatus != ''">
+                AND bind_status = #{bindStatus}
             </if>
         </where>
-        group by app.pro_no
     </select>
 </mapper>