项目统计指标开发

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

@@ -250,4 +250,6 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity
     @TableField(exist = false)
     private String projectPhase;
 
+    private String bindStatus;
+
 }

jwtech-system/src/main/java/com/kms/common/api/CommonApi.java

@@ -13,8 +13,11 @@ import com.jianwei.common.enums.BusinessType;
 import com.jianwei.common.utils.DictUtils;
 import com.jianwei.common.utils.FastDfsUtil;
 import com.jianwei.common.utils.file.FileUtils;
+import com.kms.build.domain.BsSgcjsjdBuiProInfo;
+import com.kms.build.service.BsSgcjsjdBuiProInfoService;
 import com.kms.common.entity.Chunk;
 import com.kms.common.utils.UserUtils;
+import com.kms.enterprise.domain.BsSgcYxjdEnterpriseInfo;
 import com.kms.system.domain.SysUserEnterprise;
 import com.kms.system.domain.SysUserPro;
 import com.kms.system.service.SysRoleService;
@@ -60,6 +63,9 @@ public class CommonApi {
     @Autowired
     private SysUserEnterpriseService sysUserEnterpriseService;
 
+    @Autowired
+    private BsSgcjsjdBuiProInfoService bsSgcjsjdBuiProInfoService;
+
     //    文件路径
     @Value("${jianwei.profile}")
     private String filePath;
@@ -190,7 +196,7 @@ public class CommonApi {
                 .map(x -> new SysUserPro(x, user.getId(), user.getId(), null,"0"))
                 .collect(Collectors.toList());
 
-        List<SysUserPro> list = sysUserProService.list();
+        /*List<SysUserPro> list = sysUserProService.list();
 
         List<String> stringList = list.stream().map(x -> x.getProNo()).collect(Collectors.toList());
 
@@ -198,7 +204,14 @@ public class CommonApi {
 
         if (CollectionUtil.isNotEmpty(proList1)) {
             return AjaxResult.error("该项目已绑定，不可重复绑定！");
+        }*/
+        List<BsSgcjsjdBuiProInfo> list = new ArrayList<>();
+        for (SysUserPro sysUserPro : proList) {
+            list.addAll(bsSgcjsjdBuiProInfoService.list(Wrappers.lambdaQuery(BsSgcjsjdBuiProInfo.class)
+                    .eq(BsSgcjsjdBuiProInfo::getProNo, sysUserPro.getProNo())));
         }
+        list.forEach(x->x.setBindStatus("1"));
+        bsSgcjsjdBuiProInfoService.updateBatchById(list);
 
         return AjaxResult.success(sysUserProService.saveBatch(proList));
 
@@ -214,7 +227,7 @@ public class CommonApi {
                 .map(x -> new SysUserEnterprise(user.getId(),x, "1","0"))
                 .collect(Collectors.toList());
 
-        List<SysUserEnterprise> list = sysUserEnterpriseService.list();
+        /*List<SysUserEnterprise> list = sysUserEnterpriseService.list();
 
         List<String> stringList = list.stream().map(SysUserEnterprise::getEnterpriseId).collect(Collectors.toList());
 
@@ -222,6 +235,10 @@ public class CommonApi {
 
         if (CollectionUtil.isNotEmpty(proList1)) {
             return AjaxResult.error("该企业已绑定，不可重复绑定！");
+        }*/
+        List<BsSgcYxjdEnterpriseInfo> infos = new ArrayList<>();
+        for (String proNo : proNos) {
+
         }
 
         return AjaxResult.success(sysUserEnterpriseService.saveBatch(proList));

jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java

@@ -100,6 +100,6 @@ public class SpecialProjectPreDesign extends BaseEntity
 
 
     @TableField(exist = false)
-    private String status;
+    private String bindStatus;
 
 }

jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java

@@ -36,6 +36,6 @@ public interface SpecialProjectPreDesignMapper extends BaseMapper<SpecialProject
 
     IPage<SpecialProjectPreDesign> listProject(@Param("adcd") String subString,
                                                @Param("projectName") String projectName,
-                                               @Param("status") String status,
+                                               @Param("bindStatus") String bindStatus,
                                                Page page);
 }

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

@@ -73,7 +73,7 @@ public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPr
 
 
         IPage<SpecialProjectPreDesign> page=specialProjectPreDesignMapper.listProject(sysXzqhService.getSubString(data.getAdcd()), data.getProjectName(),
-                data.getStatus(),
+                data.getBindStatus(),
                 new Page<>(sp.getPageNum(), sp.getPageSize()));
 
 

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

@@ -93,16 +93,14 @@
 
     <select id="listProject" resultMap="listProject">
         select pi.id,
-               pp.project_name,
-               pi.pro_code,
-               pp.adcd,
-               pi.project_type,
-               pi.CONSTRUCTION_NATURE,
-               pi.is_major,
-               pi.total,
-               pi.pro_no
+        pp.project_name,
+        pp.adcd,
+        pi.bind_status,
+        distinct pi.pro_no
+
         from bs_sgc_jsjd_bui_pro_info pi
-                 left join bs_slgc_qqjd_spe_pro_proposal pp on pi.pro_code = pp.project_code and pi.pro_no = pp.pro_no
+        left join bs_slgc_qqjd_spe_pro_proposal pp on pi.pro_code = pp.project_code and pi.pro_no = pp.pro_no
+
         <where>
 
             <if test="adcd!=null and adcd !=''">
@@ -111,8 +109,8 @@
             <if test="projectName!=null and projectName!=''">
                 and project_name like concat('%',#{projectName},'%')
             </if>
-            <if test="status!=null and status!=''">
-                and status=#{status}
+            <if test="bindStatus!=null and bindStatus!=''">
+                and bind_status=#{bindStatus}
             </if>
         </where>
     </select>

jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml

@@ -116,7 +116,8 @@
 
     </select>
     <select id="listProject" resultMap="EnterpriseInfo">
-        select * from bs_sgc_yxjd_enterprise_info ei left join sys_user_enterprise su on ei.id=su.enterprise_id
+        select ei.*,su.status from bs_sgc_yxjd_enterprise_info ei left join sys_user_enterprise su on
+        ei.id=su.enterprise_id
         <where>
 
             <if test="enterpriseName!=null and enterpriseName!=''">
@@ -128,9 +129,8 @@
             <if test="status!=null and status!=''">
                 and su.status=#{status}
             </if>
-
         </where>
-        order by ${orderBy} desc
+        order by #{orderBy} desc
     </select>