更新数据

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

@@ -31,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.Scheduled;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -93,13 +94,23 @@ public class WaterScheduled {
 
             }
             SingleOrg org = singleUser.getOrg();
-            List<String> collect = singleUser.getRoleList().stream().map(singleRole -> singleRole.getId()).collect(Collectors.toList());
-            List<SysRole> roles = roleService.listByIds(collect);
+            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 (ObjectUtil.isNotEmpty(roleName)){
+                    collect.add(roleName.getId());
+                }
+            }
+            List<SysRole> roles=new ArrayList<>();
+            if (ObjectUtil.isNotEmpty(collect)){
+               roles = roleService.listByIds(collect);
+            }
             if(org!=null){
               
                 user.setDeptId(org.getId());
                 String type = singleUser.getType();
-                if(type.equals("GA")){ //政务机构
+                if(type.equals("GA")||type.equals("DEV_OPS")){ //政务机构
                     user.setUserType("00");
                     if(CollectionUtil.isEmpty(roles)){
                         String deptId = user.getDeptId();
@@ -250,6 +261,7 @@ public class WaterScheduled {
                sysRole.setMd5(MD5Util.MD5Encode(singleRole.toString(), "utf-8"));
                BeanUtils.copyProperties(singleRole,sysRole);
                sysRole.setRoleName(singleRole.getName());
+//               sysRole.setId(singleRole.getId());
                sysRole.setRoleKey(singleRole.getCode());
                roleService.save(sysRole);
            }

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

@@ -15,6 +15,7 @@ import com.jianwei.common.core.domain.entity.SysUser;
 import com.jianwei.common.utils.BeanUtils;
 import com.jianwei.common.utils.poi.ExcelUtil;
 import com.kms.build.domain.BsSgcjsjdBuiProInfo;
+import com.kms.build.domain.vo.BsSgcJsjdBuiAttendanceInformationExcel;
 import com.kms.build.service.BsSgcjsjdBuiProInfoService;
 import com.kms.common.utils.BaseEntityUtils;
 
@@ -30,21 +31,15 @@ import com.kms.system.service.SysXzqhService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.jianwei.common.annotation.Log;
 import com.jianwei.common.core.domain.AjaxResult;
 import com.jianwei.common.enums.BusinessType;
-
+import org.springframework.web.multipart.MultipartFile;
 
 
 /**
@@ -154,9 +149,10 @@ public class BsSgcjsjdBuiProInfoController extends BaseController
                 .eq(SpecialProjectProposal::getProNo, byId.getProNo())
                 .eq(SpecialProjectProposal::getProjectCode, byId.getProCode()));
 
+        if (ObjectUtil.isNotEmpty(one)){
         byId.setProjectName(one.getProjectName());
         byId.setAdcd(one.getAdcd());
-
+        }
         return AjaxResult.success(byId);
     }
 
@@ -171,21 +167,15 @@ public class BsSgcjsjdBuiProInfoController extends BaseController
     public AjaxResult add(@RequestBody BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo)
     {
         BaseEntityUtils.preInsert(bsSgcjsjdBuiProInfo);
+        if (bsSgcjsjdBuiProInfo.getIsApproval().equals("1")){
         QueryWrapper<SpecialProjectProposal> qw=new QueryWrapper<>();
         SpecialProjectProposal one = specialProjectProposalService.getOne(qw.eq("project_code", bsSgcjsjdBuiProInfo.getProCode()).eq("pro_no", bsSgcjsjdBuiProInfo.getProNo()));
-        if (ObjectUtil.isNotEmpty(one)){
         //设置项目在建状态
         UpdateWrapper<SpecialProjectProposal> updateWrapper = new UpdateWrapper<>();
         updateWrapper.set("is_construction", "1");
         updateWrapper.eq("project_code", bsSgcjsjdBuiProInfo.getProCode());
         updateWrapper.eq("pro_no", bsSgcjsjdBuiProInfo.getProNo());
         specialProjectProposalService.update(updateWrapper);
-        }else {
-            SpecialProjectProposal specialProjectProposal=new SpecialProjectProposal();
-            BeanUtils.copyBeanProp(specialProjectProposal,bsSgcjsjdBuiProInfo);
-            specialProjectProposal.setProjectCode(bsSgcjsjdBuiProInfo.getProCode());
-            specialProjectProposal.setIsConstruction("1");
-            specialProjectProposalService.save(specialProjectProposal);
         }
 
         //设置总金额
@@ -262,4 +252,37 @@ public class BsSgcjsjdBuiProInfoController extends BaseController
     {
         return toAjax(bsSgcjsjdBuiProInfoService.removeByIds(Arrays.asList(ids)));
     }
+
+
+    @PostMapping("/importData")
+    @Transactional
+    public AjaxResult importData(@RequestParam(value = "file") MultipartFile file) {
+        ExcelUtil<BsSgcjsjdBuiProInfo> util = new ExcelUtil<>(BsSgcjsjdBuiProInfo.class);
+        try {
+            List<BsSgcjsjdBuiProInfo> list = util.importExcel(file.getInputStream());
+            list.remove(0);
+            for (BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo:list){
+                if (bsSgcjsjdBuiProInfo.getProjectUnitLegal().contains("1")) {
+                    String[] split = bsSgcjsjdBuiProInfo.getProjectUnitLegal().split(
+                            bsSgcjsjdBuiProInfo.getProjectUnitLegal().substring(bsSgcjsjdBuiProInfo.getProjectUnitLegal().indexOf("1") - 1, bsSgcjsjdBuiProInfo.getProjectUnitLegal().indexOf("1")));
+
+                    if (split.length>=2){
+                        bsSgcjsjdBuiProInfo.setProjectUnitLegal(split[0]);
+                        bsSgcjsjdBuiProInfo.setProjectUnitLegalPhone(split[1]);
+                    }
+                    SysXzqh one = sysXzqhService.getOne(new QueryWrapper<SysXzqh>().eq("NAME",bsSgcjsjdBuiProInfo.getParentAcad()));
+                    if (ObjectUtil.isNotEmpty(one)){
+                        SysXzqh adcd = sysXzqhService.getOne(new QueryWrapper<SysXzqh>().eq("NAME",bsSgcjsjdBuiProInfo.getAdcd()).eq("PARENTID",one.getXzqhdm()));
+                        if (ObjectUtil.isNotEmpty(adcd)){
+                            bsSgcjsjdBuiProInfo.setAdcd(adcd.getXzqhdm());
+                        }
+                    }
+                }
+                bsSgcjsjdBuiProInfoService.saveOrUpdate(bsSgcjsjdBuiProInfo);
+            }
+            return AjaxResult.success(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

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

@@ -30,14 +30,13 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 项目名称 */
-    @Excel(name = "项目名称")
+    @Excel(name = "工程名称")
     @ApiModelProperty("项目名称")
-    @TableField(exist = false)
     private String projectName;
 
     /** 项目法人 */
-    @Excel(name = "项目法人")
-    @ApiModelProperty("项目法人")
+    @Excel(name = "单位")
+    @ApiModelProperty("项目法人单位")
     private String projectLegalPerson;
 
     @Excel(name = "单位负责人电话")
@@ -52,7 +51,7 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity
     @ApiModelProperty("项目负责人电话")
     private String projectSuperintendentPhone;
 
-    @Excel(name = "单位法定代表人")
+    @Excel(name = "项目法人联系人姓名和电话")
     @ApiModelProperty("项目法定代表人")
     private String projectUnitLegal;
 
@@ -72,7 +71,7 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity
     private String engineeringPurposes;
 
     /** 项目建设地址 */
-    @Excel(name = "项目建设地址")
+    @Excel(name = "地址")
     @ApiModelProperty("项目建设地址")
     private String constructionAddress;
 
@@ -92,11 +91,14 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity
     private String constructionContent;
 
     /** 行政区划 */
-    @Excel(name = "行政区划")
+    @Excel(name = "所在县（市、区）")
     @ApiModelProperty("行政区划")
-    @TableField(exist = false)
     private String adcd;
 
+    @Excel(name = "所在市")
+    @TableField(exist = false)
+    private String parentAcad;
+
     /** 所属流域 */
     @Excel(name = "所属流域")
     @ApiModelProperty("所属流域")
@@ -239,10 +241,12 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity
     private String projectDivisionAttachment;
 
     //开工日期
+    @Excel(name = "开工日期",dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
     private Date commencementDate;
 
     //计划竣工日期
+    @Excel(name = "预计主体完工时间",dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date plannedCompletionDate;
 
@@ -270,9 +274,11 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity
     private String alertType;
 
     //是否为安全度汛重点工程
+    @Excel(name = "是否为安全度汛重点工程")
     private String isKeyProject;
 
     //是否穿破堤坝施工
+    @Excel(name = "是否穿破堤坝施工")
     private String isPierceProject;
 
 }

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

@@ -23,6 +23,8 @@ import com.kms.build.mapper.BsSgcJsjdBuiProgressPlanMapper;
 import com.kms.build.mapper.BsSgcjsjdBuiProInfoMapper;
 import com.kms.common.utils.UserUtils;
 import com.kms.earlyStage.domain.SpecialProjectInfo;
+import com.kms.earlyStage.domain.SpecialProjectProposal;
+import com.kms.earlyStage.mapper.SpecialProjectProposalMapper;
 import com.kms.enterprise.domain.dto.NumDto;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
@@ -78,6 +80,11 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
     @Autowired
     private BsSgcJsjdBuiProgressPlanMapper bsSgcJsjdBuiProgressPlanMapper;
 
+    @Autowired
+    private SpecialProjectProposalMapper specialProjectProposalMapper;
+
+
+
     public IPage selectPage(SearchParam<BsSgcjsjdBuiProInfo> sp, String adcd) {
 
         BsSgcjsjdBuiProInfo data = sp.getData();
@@ -142,6 +149,8 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                     data.getProjectName(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
         }
 
+
+
         Page<BsSgcjsjdBuiProInfo> page = new Page<>();
         page.setRecords(list);
         page.setTotal(list.size());
@@ -164,9 +173,19 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                 contractPayment = contractPayment.add(actualPayment);
             }
             record.setContractPayment(contractPayment);
-
+            if (ObjectUtil.isEmpty(record.getProjectName())){
+                QueryWrapper<SpecialProjectProposal> qw = new QueryWrapper<>();
+                qw.eq("PRO_NO", record.getProNo());
+                qw.eq("PROJECT_CODE", record.getProCode());
+                SpecialProjectProposal one = specialProjectProposalMapper.selectOne(qw);
+                record.setProjectName(one.getProjectName());
+                record.setAdcd(one.getAdcd());
+                bsSgcjsjdBuiProInfoMapper.updateById(record);
+            }
         }
+        List<BsSgcjsjdBuiProInfo> total = bsSgcjsjdBuiProInfoMapper.selectList(null);
         page.setRecords(records);
+        page.setTotal(total.size());
         return page;
 
     }
@@ -210,6 +229,15 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         for (int i = 0; i < list.getRecords().size(); i++) {
             String proNo = list.getRecords().get(i).getProNo();
             String proCode = list.getRecords().get(i).getProCode();
+//            if ( ObjectUtil.isEmpty(list.getRecords().get(i).getProjectName())){
+//                SpecialProjectProposal specialProjectProposal =
+//                        specialProjectProposalMapper.selectOne(new QueryWrapper<SpecialProjectProposal>()
+//                                .eq("PRO_NO",proNo)
+//                                .eq("PROJECT_CODE",proCode));
+//                if(ObjectUtil.isNotEmpty(specialProjectProposal)){
+//                    list.getRecords().get(i).setProjectName(specialProjectProposal.getProjectName());
+//                }
+//            }
 
             BsSgcJsjdBuiConAcc conAcc = bsSgcJsjdBuiConAccService.getOne(Wrappers.lambdaQuery(BsSgcJsjdBuiConAcc.class)
                     .eq(BsSgcJsjdBuiConAcc::getProCode, proCode)
@@ -343,11 +371,13 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         HashMap<String, Use> map = new HashMap<>();
         for (int i = 0; i < list.size(); i++) {
             Use use = new Use();
+            if (ObjectUtil.isNotEmpty(list.get(i).getIsMajor())){
             if (list.get(i).getIsMajor().equals("zd")) {
                 use.setZd(list.get(i).getNum());
             } else {
                 use.setMs(list.get(i).getNum());
             }
+            }
             for (int j = 0; j < list.size(); j++) {
                 if (!ObjectUtil.isEmpty(list.get(i).getCity())) {
                     if (list.get(i).getCity().equals(list.get(j).getCity())

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

@@ -6,9 +6,9 @@
 
     <sql id="info">
         select pi.id,
-               pp.project_name,
+               pi.project_name,
                pi.pro_code,
-               pp.adcd,
+               pi.adcd,
                pi.project_type,
                pi.CONSTRUCTION_NATURE,
                pi.is_major,
@@ -23,7 +23,7 @@
 
     <sql id="projectMangeInfo">
         select pi.id,
-               pp.project_name,
+               pi.project_name,
                pi.pro_code,
                pp.adcd,
                pi.project_type,
@@ -196,7 +196,7 @@
             <where>
                 1=1
                 <if test="projectName!=null and projectName!=''">
-                    and pp.project_name like concat('%',#{projectName},'%')
+                    and pi.project_name like concat('%',#{projectName},'%')
                 </if>
                 <if test="isMajor!=null and isMajor!=''">
                     and pi.is_major=#{isMajor}
@@ -205,7 +205,7 @@
                     and pi.project_type=#{projectType}
                 </if>
                 <if test="adcd!=null and adcd !=''">
-                    and pp.adcd like concat(#{adcd},'%')
+                    and pi.adcd like concat(#{adcd},'%')
                 </if>
             </where>
             order by pi.${orderBy} desc