Merge remote-tracking branch 'origin/master'

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

@@ -18,6 +18,7 @@ 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.enterprise.service.BsSgcYxjdEnterpriseInfoService;
 import com.kms.system.domain.SysUserEnterprise;
 import com.kms.system.domain.SysUserPro;
 import com.kms.system.service.SysRoleService;
@@ -66,6 +67,9 @@ public class CommonApi {
     @Autowired
     private BsSgcjsjdBuiProInfoService bsSgcjsjdBuiProInfoService;
 
+    @Autowired
+    private BsSgcYxjdEnterpriseInfoService bsSgcYxjdEnterpriseInfoService;
+
     //    文件路径
     @Value("${jianwei.profile}")
     private String filePath;
@@ -238,7 +242,9 @@ public class CommonApi {
         }*/
         List<BsSgcYxjdEnterpriseInfo> infos = new ArrayList<>();
         for (String id : proNos) {
-
+            BsSgcYxjdEnterpriseInfo byId = bsSgcYxjdEnterpriseInfoService.getById(id);
+            byId.setBindStatus("1");
+            bsSgcYxjdEnterpriseInfoService.updateById(byId);
         }
 
         return AjaxResult.success(sysUserEnterpriseService.saveBatch(proList));

jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdEnterpriseInfo.java

@@ -186,7 +186,7 @@ public class BsSgcYxjdEnterpriseInfo extends BaseEntity
 
     private String proCode;
 
-    @TableField(exist = false)
-    private String status;
+
+    private String bindStatus;
 
 }

jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java

@@ -42,7 +42,7 @@ public interface BsSgcYxjdEnterpriseInfoMapper extends BaseMapper<BsSgcYxjdEnter
 
     IPage<BsSgcYxjdEnterpriseInfo> listProject(@Param("adcd") String subString,
                                                @Param("enterpriseName") String enterpriseName,
-                                               @Param("status") String status,
+                                               @Param("bindStatus") String bindStatus,
                                                Page page);
 
 }

jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java

@@ -162,7 +162,7 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
 
 
         IPage<BsSgcYxjdEnterpriseInfo> page=bsSgcYxjdEnterpriseInfoMapper.listProject(sysXzqhService.getSubString(data.getAdcd()),
-                data.getEnterpriseName(),data.getStatus(),
+                data.getEnterpriseName(),data.getBindStatus(),
                 new Page<>(sp.getPageNum(), sp.getPageSize()));
 
 

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

@@ -116,18 +116,17 @@
 
     </select>
     <select id="listProject" resultMap="EnterpriseInfo">
-        select ei.*,su.status from bs_sgc_yxjd_enterprise_info ei left join sys_user_enterprise su on
-        ei.id=su.enterprise_id
+        select *
+        from bs_sgc_yxjd_enterprise_info ei
         <where>
-
             <if test="enterpriseName!=null and enterpriseName!=''">
-                and ei.enterprise_name like concat('%',#{enterpriseName},'%')
+                and enterprise_name like concat('%',#{enterpriseName},'%')
             </if>
             <if test="adcd!=null and adcd !=''">
-                and ei.adcd like concat(#{adcd},'%')
+                and adcd like concat(#{adcd},'%')
             </if>
-            <if test="status!=null and status!=''">
-                and su.status=#{status}
+            <if test="bindStatus!=null and bindStatus!=''">
+                and bind_status=#{bindStatus}
             </if>
         </where>
         order by #{orderBy} desc