新增项目合并和拆分

huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouMergesplitinfoController.java

@@ -0,0 +1,74 @@
+package com.easy.admin.modules.huzhou.controller;
+
+
+import com.easy.admin.common.core.annotation.ResponseResult;
+import com.easy.admin.modules.huzhou.entity.HuzhouMergesplitinfo;
+import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo;
+import com.easy.admin.modules.huzhou.service.HuzhouMergesplitinfoService;
+import com.easy.admin.modules.huzhou.vo.HuzhouMergesplitinfoVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * (HuzhouMergesplitinfo)表控制层
+ *
+ * @author makejava
+ * @since 2024-07-18 15:17:34
+ */
+@RestController
+@RequestMapping("/huzhouMergesplitinfo")
+@ResponseResult
+public class HuzhouMergesplitinfoController {
+    /**
+     * 服务对象
+     */
+    @Autowired
+    private HuzhouMergesplitinfoService huzhouMergesplitinfoService;
+
+    @PostMapping("/submitMergeProject")
+    public void submitMergeProject(@RequestBody HuzhouMergesplitinfoVo mergesplitinfoVo){
+        huzhouMergesplitinfoService.submitMergeProject(mergesplitinfoVo);
+    }
+    @PostMapping("/submitSplitProject")
+    public void submitSplitProject(@RequestBody List<HuzhouMergesplitinfoVo> mergesplitinfoVoList){
+        huzhouMergesplitinfoService.submitSplitProject(mergesplitinfoVoList);
+    }
+    @GetMapping("/getMergeDetailList")
+    public List<HuzhouMergesplitinfo> getMergeDetailList(@RequestParam("projectid") String projectid){
+        List<HuzhouMergesplitinfo> result =  huzhouMergesplitinfoService.getMergeDetailList(projectid);
+        return result;
+    }
+    @GetMapping("/getSplitDetailList")
+    public List<HuzhouMergesplitinfo> getSplitDetailList(@RequestParam("projectid") String projectid){
+        List<HuzhouMergesplitinfo> result =  huzhouMergesplitinfoService.getSplitDetailList(projectid);
+        return result;
+    }
+    @PostMapping("/approvalMergeProject")
+    public void approvalMergeProject(@RequestParam(value = "file",required = false) MultipartFile[] file,
+                                    String taskId,
+                                    String flag,
+                                    String fieldChangeGroupid,
+                                    String comment,
+                                    String isEdit,
+                                    HuzhouProjectinfo newProjectinfo) throws Exception {
+//        huzhouMergesplitinfoService.approvalMergeProject(file,taskId,flag,fieldChangeGroupid,comment,isEdit,newProjectinfo);
+    }
+    @PostMapping("/approvalSplitProject")
+    public void approvalSplitProject(@RequestParam(value = "file",required = false) MultipartFile[] file,
+                                     String taskId,
+                                     String flag,
+                                     String fieldChangeGroupid,
+                                     String comment,
+                                     String isEdit,
+                                     HuzhouProjectinfo newProjectinfo) throws Exception {
+//        huzhouMergesplitinfoService.approvalSplitProject(file,taskId,flag,fieldChangeGroupid,comment,isEdit,newProjectinfo);
+    }
+}
+

huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/WorkflowController.java

@@ -426,13 +426,13 @@ public class WorkflowController {
 //                    i--;
                     }
                 }else{
-                    HistoricTaskInstance item = list.get(list.size()-1);
+//                    HistoricTaskInstance item = list.get(list.size()-1);
                     for (int i =0;i<userTaskList.size();i++ ) {
                         UserTask task=userTaskList.get(i);
 //                HashMap<String, Object> lastUser = approvalEntityList.get(approvalEntityList.size() - 1);//获取最后一个
-                        Object taskName = item.getName();
+                        Object taskName = lastUser.get("taskName");
                         boolean match = task.getName().equals(taskName);
-                        if(!match){
+                        if(match){
                             userTaskList.remove(task);
                         }
                         else {
@@ -500,9 +500,10 @@ public class WorkflowController {
                 }
                 Boolean isrecall = true;
                 for (HashMap<String,Object> hash: approvalEntityList) {
-                    String operator = hash.get("operator").toString();
+                    String operator = hash.get("operator").toString();//历史任务
-                    String nickname = hashMap.get("operator").toString();
+                    String nickname = hashMap.get("operator").toString();//当前任务
-                    if(operator.equals(nickname)&&hash.get("operateDate")==null){
+                    String taskName= hashMap.get("taskName").toString();//当前任务
+                    if(operator.equals(nickname)&&hash.get("operateDate")==null&&taskName.equals(hash.get("taskName"))){
                         isrecall = false;
                     }
                 }

huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouMergesplitinfoMapper.java

@@ -0,0 +1,11 @@
+package com.easy.admin.modules.huzhou.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.easy.admin.modules.huzhou.entity.HuzhouMergesplitinfo;
+
+import java.util.List;
+import java.util.Map;
+
+public interface HuzhouMergesplitinfoMapper extends BaseMapper<HuzhouMergesplitinfo> {
+
+}

huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouMergesplitinfo.java

@@ -0,0 +1,179 @@
+package com.easy.admin.modules.huzhou.entity;
+
+import com.easy.admin.modules.huzhou.entity.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * (HuzhouMergesplitinfo)实体类
+ *
+ * @author makejava
+ * @since 2024-07-18 15:18:04
+ */
+@Data
+public class HuzhouMergesplitinfo extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 509578568779634240L;
+    /**
+     * id
+     */
+    private String id;
+    /**
+     * 项目名称
+     */
+    private String projectName;
+    /**
+     * 行政区划
+     */
+    private String adminDivision;
+    /**
+     * 主要任务及标志性成果
+     */
+    private String description;
+    /**
+     * 项目类型
+     */
+    private String projectType;
+    /**
+     * 责任单位
+     */
+    private String dutyWorkplace;
+    /**
+     * 建设年限
+     */
+    private String constructionPeriod;
+    /**
+     * 中央资金
+     */
+    private Double centralMoney;
+    /**
+     * 省级资金
+     */
+    private Double provincialMoney;
+    /**
+     * 市级资金
+     */
+    private Double cityMoney;
+    /**
+     * 区县级资金
+     */
+    private Double countyMoney;
+    /**
+     * 所属改革任务
+     */
+    private String reformName;
+    /**
+     * 上级指导处室
+     */
+    private String superLeader;
+    /**
+     * 项目联系人
+     */
+    private String projectContacts;
+    /**
+     * 联系电话
+     */
+    private String phone;
+    /**
+     * 管理单位
+     */
+    private String manageOrg;
+    /**
+     * 管理单位负责人
+     */
+    private String manageContactor;
+    /**
+     * 监理单位
+     */
+    private String controler;
+    /**
+     * 监理单位负责人
+     */
+    private String controlerContactor;
+    /**
+     * 监管单位
+     */
+    private String supervisor;
+    /**
+     * 监管单位负责人
+     */
+    private String supervisorContactor;
+    /**
+     * 建设单位
+     */
+    private String owner;
+    /**
+     * 建设单位负责人
+     */
+    private String ownerContactor;
+    /**
+     * 咨询单位
+     */
+    private String consult;
+    /**
+     * 咨询单位负责人
+     */
+    private String consultContactor;
+    /**
+     * 承建单位
+     */
+    private String contructor;
+    /**
+     * 承建单位负责人
+     */
+    private String contructorContactor;
+    /**
+     * 项目阶段
+
+     */
+    private String stage;
+
+    /**
+     * 单位属性
+     */
+    private String workplaceProperties;
+    /**
+     * 总投资
+     */
+    private Double totalMoney;
+    /**
+     * 自筹资金
+     */
+    private Double selfMoney;
+    /**
+     * 2023年支付
+     */
+    private Double payamount2023Money;
+    /**
+     * 2024年支付
+     */
+    private Double payamount2024Money;
+    /**
+     * 2025年支付
+     */
+    private BigDecimal payamount2025Money;
+    /**
+     * 是否在发起修改 0 否，1 是
+     */
+    private String ismodify;
+    /**
+     * 是周报还是月报
+     */
+    private String reportType;
+    /**
+     * 0：异常项目；1：入库项目；2：配套项目
+
+     */
+    private String type;
+    /**
+     * 项目id
+     */
+    private String projectId;
+    /**
+     * 是拆分还是合并
+     */
+    private String mergeOrSplit;
+}
+

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/HuzhouMergesplitinfoService.java

@@ -0,0 +1,26 @@
+
+package com.easy.admin.modules.huzhou.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.easy.admin.modules.huzhou.entity.HuzhouMergesplitinfo;
+import com.easy.admin.modules.huzhou.vo.HuzhouMergesplitinfoVo;
+
+import java.util.List;
+
+/**
+ * (HuzhouMergesplitinfo)表服务接口
+ *
+ * @author makejava
+ * @since 2024-07-18 15:20:04
+ */
+public interface HuzhouMergesplitinfoService extends IService<HuzhouMergesplitinfo> {
+
+
+    void submitMergeProject(HuzhouMergesplitinfoVo mergesplitinfoVo);
+
+    List<HuzhouMergesplitinfo> getMergeDetailList(String projectid);
+
+    List<HuzhouMergesplitinfo> getSplitDetailList(String projectid);
+
+    void submitSplitProject(List<HuzhouMergesplitinfoVo> mergesplitinfoVoList);
+}

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouChangefieldmanageServiceImpl.java

@@ -10,6 +10,7 @@ import com.easy.admin.modules.huzhou.service.IHuzhouUploadfileinfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -19,6 +20,8 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
+@Transactional
+
 public class HuzhouChangefieldmanageServiceImpl  extends ServiceImpl<HuzhouChangefieldmanageMapper, HuzhouChangefieldmanage> implements IHuzhouChangefieldmanageService {
 
     @Override

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -31,6 +32,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
+@Transactional
 
 public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinfoMapper, HuzhouContractinfo> implements IHuzhouContractinfoService {
     @Value(value = "${jeecg.path.upload}")

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java

@@ -73,6 +73,7 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
         //查询当前字段是否在流程中
         LambdaQueryWrapper<HuzhouFieldchangehistory> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(HuzhouFieldchangehistory::getFieldValue,fieldValue);
+        queryWrapper.eq(HuzhouFieldchangehistory::getProjectid,projectid);
         queryWrapper.eq(HuzhouFieldchangehistory::getStatus,"1");
         List<HuzhouFieldchangehistory> fieldchangehistoryList = fieldchangehistoryMapper.selectList(queryWrapper);
         if(fieldchangehistoryList!=null&&fieldchangehistoryList.size()>0){
@@ -329,10 +330,12 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
         List<HuzhouFieldchangehistory> list = list(queryWrapper);
         Map<String, HuzhouFieldchangehistory> nameMap = list.stream().collect(Collectors.toMap(HuzhouFieldchangehistory::getFieldValue, o -> o));
         List<HuzhouFieldchangehistory> result = new ArrayList<>();
-        List<String> sortList = Arrays.asList("totalMoney","centralMoney","provincialMoney","cityMoney",
+        List<String> sortList = Arrays.asList("constructionPeriod","superLeader","reformName","workplaceProperties","dutyWorkplace","adminDivision","projectContacts","totalMoney","centralMoney","provincialMoney","cityMoney",
                 "countyMoney","selfMoney","payamount2023Money","payamount2024Money","payamount2025Money");
         for(String name:sortList){
-            result.add(nameMap.get(name));
+            if(nameMap.get(name)!=null){
+                result.add(nameMap.get(name));
+            }
         }
         return result;
     }

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouMergesplitinfoServiceImpl.java

@@ -0,0 +1,190 @@
+package com.easy.admin.modules.huzhou.service.impl;
+
+
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.easy.admin.auth.service.SysUserService;
+import com.easy.admin.common.core.exception.EasyException;
+import com.easy.admin.modules.huzhou.dao.HuzhouMergesplitinfoMapper;
+import com.easy.admin.modules.huzhou.entity.HuzhouMergesplitinfo;
+import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo;
+import com.easy.admin.modules.huzhou.entity.WorkFlow;
+import com.easy.admin.modules.huzhou.service.HuzhouMergesplitinfoService;
+import com.easy.admin.modules.huzhou.service.IHuzhouProjectinfoService;
+import com.easy.admin.modules.huzhou.service.IHuzhouUserprojectService;
+import com.easy.admin.modules.huzhou.service.IWorkflowService;
+import com.easy.admin.modules.huzhou.vo.HuzhouMergesplitinfoVo;
+import com.easy.admin.sys.model.SysDict;
+import com.easy.admin.sys.service.SysDictService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.task.Task;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * (HuzhouMergesplitinfo)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-07-18 15:20:04
+ */
+@Service
+@Transactional
+public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergesplitinfoMapper, HuzhouMergesplitinfo> implements HuzhouMergesplitinfoService {
+    @Autowired
+    IHuzhouProjectinfoService projectinfoService;
+    @Autowired
+    IHuzhouUserprojectService userprojectService;
+    @Autowired
+    HuzhouMergesplitinfoMapper mergesplitinfoMapper;
+    @Autowired
+    private IWorkflowService workflowService;
+    @Autowired
+    private RuntimeService runtimeService;
+    @Autowired
+    private SysUserService userService;
+    @Autowired
+    private SysDictService sysDictService;
+    @Autowired
+    private TaskService taskService;
+    @Override
+    public void submitMergeProject(HuzhouMergesplitinfoVo mergesplitinfoVo) {
+        HuzhouProjectinfo huzhouProjectinfo = new HuzhouProjectinfo();
+        BeanUtils.copyProperties(mergesplitinfoVo, huzhouProjectinfo);
+        userprojectService.saveFromProject(huzhouProjectinfo,"0");
+        huzhouProjectinfo.setCityMoney(0.0);
+        huzhouProjectinfo.setCountyMoney(0.0);
+        huzhouProjectinfo.setProvincialMoney(0.0);
+        huzhouProjectinfo.setSelfMoney(0.0);
+        huzhouProjectinfo.setCentralMoney(0.0);
+        huzhouProjectinfo.setTotalMoney(0.0);
+        huzhouProjectinfo.setPayamount2023Money(0.0);
+        huzhouProjectinfo.setPayamount2024Money(0.0);
+        huzhouProjectinfo.setPayamount2025Money(0.0);
+        huzhouProjectinfo.setStage("-1");//0
+        projectinfoService.save(huzhouProjectinfo);
+        for (String oldprojectid :mergesplitinfoVo.getProjectids()
+             ) {
+            HuzhouProjectinfo projectinfo = projectinfoService.getById(oldprojectid);
+            HuzhouMergesplitinfo huzhouMergesplitinfo = new HuzhouMergesplitinfo();
+            BeanUtils.copyProperties(projectinfo, huzhouMergesplitinfo);
+            huzhouMergesplitinfo.setMergeOrSplit("merge");
+            huzhouMergesplitinfo.setProjectId(huzhouProjectinfo.getId());
+            projectinfo.setStage("0.1");
+            projectinfoService.updateById(projectinfo);
+            mergesplitinfoMapper.insert(huzhouMergesplitinfo);
+        }
+        //发起流程
+        String superLeader = mergesplitinfoVo.getSuperLeader();
+        WorkFlow workFlow = workflowService.createFlow("fieldChange",huzhouProjectinfo.getId());
+        Task task = workFlow.getTask();
+        String taskId = task.getId();
+        String processInstanceId = workFlow.getProcessInstanceId();
+        //获取上级指导室中文名称
+        SysDict dict = sysDictService.getDictByCode("superLeader", superLeader);
+        String dictName = dict.getName();
+        //上级指导室中文名称查询角色有哪些人
+        List<HashMap<String, String>> userDictByRoles = userService.getUserDictByRoles(dictName);
+        ArrayList<String> strings = new ArrayList<>();
+        if(userDictByRoles==null||userDictByRoles.size()==0){
+            String error = "任务牵头处室"+dictName+"负责人未找到";
+            throw new EasyException(error);
+        }
+        for (HashMap<String, String> map:userDictByRoles
+        ) {
+            String userid = map.get("value");
+            strings.add(userid);
+        }
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("taskLeadingDepartment",strings);
+        runtimeService.setVariable(processInstanceId, "taskLeadingDepartment", strings);//设置第三个人变量信息
+        taskService.complete(taskId, variables);
+    }
+
+    @Override
+    public List<HuzhouMergesplitinfo> getMergeDetailList(String projectid) {
+        LambdaQueryWrapper<HuzhouMergesplitinfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(HuzhouMergesplitinfo::getProjectId, projectid);
+        queryWrapper.eq(HuzhouMergesplitinfo::getMergeOrSplit, "merge");
+        return mergesplitinfoMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public List<HuzhouMergesplitinfo> getSplitDetailList(String projectid) {
+        LambdaQueryWrapper<HuzhouMergesplitinfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(HuzhouMergesplitinfo::getProjectId, projectid);
+        queryWrapper.eq(HuzhouMergesplitinfo::getMergeOrSplit, "split");
+        return mergesplitinfoMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public void submitSplitProject(List<HuzhouMergesplitinfoVo> mergesplitinfoVoList) {
+        String oldId = mergesplitinfoVoList.get(0).getProjectids().get(0);
+        for (HuzhouMergesplitinfoVo mergesplitinfoVo : mergesplitinfoVoList) {
+            HuzhouProjectinfo huzhouProjectinfo = new HuzhouProjectinfo();
+            BeanUtils.copyProperties(mergesplitinfoVo, huzhouProjectinfo);
+            userprojectService.saveFromProject(huzhouProjectinfo, "0");
+            huzhouProjectinfo.setCityMoney(0.0);
+            huzhouProjectinfo.setCountyMoney(0.0);
+            huzhouProjectinfo.setProvincialMoney(0.0);
+            huzhouProjectinfo.setSelfMoney(0.0);
+            huzhouProjectinfo.setCentralMoney(0.0);
+            huzhouProjectinfo.setTotalMoney(0.0);
+            huzhouProjectinfo.setPayamount2023Money(0.0);
+            huzhouProjectinfo.setPayamount2024Money(0.0);
+            huzhouProjectinfo.setPayamount2025Money(0.0);
+            huzhouProjectinfo.setStage("-1");//0
+            projectinfoService.save(huzhouProjectinfo);
+            for (String oldprojectid :mergesplitinfoVo.getProjectids()
+            ) {
+                HuzhouProjectinfo projectinfo = projectinfoService.getById(oldprojectid);
+                HuzhouMergesplitinfo huzhouMergesplitinfo = new HuzhouMergesplitinfo();
+                BeanUtils.copyProperties(projectinfo, huzhouMergesplitinfo);
+                huzhouMergesplitinfo.setMergeOrSplit("split");
+                huzhouMergesplitinfo.setProjectId(huzhouProjectinfo.getId());
+                projectinfo.setStage("0.1");
+                projectinfoService.updateById(projectinfo);
+                mergesplitinfoMapper.insert(huzhouMergesplitinfo);
+            }
+
+        }
+        HuzhouProjectinfo oldProjectinfo = projectinfoService.getById(oldId);
+        //发起流程
+        String superLeader = oldProjectinfo.getSuperLeader();
+        WorkFlow workFlow = workflowService.createFlow("fieldChange",oldId);
+        Task task = workFlow.getTask();
+        String taskId = task.getId();
+        String processInstanceId = workFlow.getProcessInstanceId();
+        //获取上级指导室中文名称
+        SysDict dict = sysDictService.getDictByCode("superLeader", superLeader);
+        String dictName = dict.getName();
+        //上级指导室中文名称查询角色有哪些人
+        List<HashMap<String, String>> userDictByRoles = userService.getUserDictByRoles(dictName);
+        ArrayList<String> strings = new ArrayList<>();
+        if(userDictByRoles==null||userDictByRoles.size()==0){
+            String error = "任务牵头处室"+dictName+"负责人未找到";
+            throw new EasyException(error);
+        }
+        for (HashMap<String, String> map:userDictByRoles
+        ) {
+            String userid = map.get("value");
+            strings.add(userid);
+        }
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("taskLeadingDepartment",strings);
+        runtimeService.setVariable(processInstanceId, "taskLeadingDepartment", strings);//设置第三个人变量信息
+        taskService.complete(taskId, variables);
+    }
+}

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPerformancescoreServiceImpl.java

@@ -19,12 +19,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.InputStream;
 import java.util.List;
 
 @Service
+@Transactional
+
 public class HuzhouPerformancescoreServiceImpl extends ServiceImpl<HuzhouPerformancescoreMapper, HuzhouPerformancescore> implements IHuzhouPerformancescoreService {
     private static final Logger logger = LoggerFactory.getLogger(ExecutorConfig.class);
     @Autowired

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPeriodicallabCountServiceImpl.java

@@ -9,11 +9,14 @@ import com.easy.admin.modules.huzhou.service.IHuzhouPeriodicallabCountService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Objects;
 
 @Service
+@Transactional
+
 public class HuzhouPeriodicallabCountServiceImpl extends ServiceImpl<HuzhouPeriodicallabCountMapper, HuzhouPeriodicallabCount> implements IHuzhouPeriodicallabCountService {
 
     @Autowired

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPeriodicallabServiceImpl.java

@@ -19,6 +19,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -34,6 +35,8 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 @Service
+@Transactional
+
 public class HuzhouPeriodicallabServiceImpl extends ServiceImpl<HuzhouPeriodicallabMapper, HuzhouPeriodicallab> implements IHuzhouPeriodicallabService {
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoHistoryServiceImpl.java

@@ -22,12 +22,15 @@ import com.easy.admin.modules.huzhou.vo.HuzhouPlaninfoOV;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
+@Transactional
+
 public class HuzhouPlaninfoHistoryServiceImpl extends ServiceImpl<HuzhouPlaninfoHistoryMapper, HuzhouPlaninfoHistory> implements IHuzhouPlaninfoHistoryService {
     @Autowired
     private HuzhouPlaninfoHistoryMapper planinfoHistoryMapper;

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProcessinfoServiceImpl.java

@@ -18,10 +18,12 @@ import com.easy.admin.modules.huzhou.service.IHuzhouProcessinfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
 @Service
+@Transactional
 
 public class HuzhouProcessinfoServiceImpl extends ServiceImpl<HuzhouProcessinfoMapper, HuzhouProcessinfo> implements IHuzhouProcessinfoService {
 //    @Autowired

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectassessmentService.java

@@ -25,6 +25,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -38,6 +39,8 @@ import java.time.temporal.ChronoUnit;
 import java.util.*;
 
 @Service
+@Transactional
+
 public class HuzhouProjectassessmentService extends ServiceImpl<HuzhouProjectassessmentMapper, HuzhouProjectassessment> implements IHuzhouProjectassessmentService {
     @Autowired
     private HuzhouProjectassessmentMapper projectassessmentMapper;

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

@@ -1128,7 +1128,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
 
         ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectInfo);
         List<HuzhouProjectinfoOV> projectinfoOVList = projectinfoMapper.getProjectAndChildInfoPageList(projectInfoAuthSelect);
-        List<HuzhouProjectinfoOV> rkList = projectinfoOVList.stream().filter(x -> x.getType().equals("1")).collect(Collectors.toList());
+        List<HuzhouProjectinfoOV> rkList = projectinfoOVList.stream().filter(x -> Objects.equals(x.getType(), "1")).collect(Collectors.toList());
         List<String> rkIds = rkList.stream().map(x -> x.getId()).collect(Collectors.toList());
         List<String> projectIds = projectinfoOVList.stream().map(x -> x.getId()).collect(Collectors.toList());
         //项目数量统计by type

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouRegulationlabServiceImpl.java

@@ -12,6 +12,7 @@ import com.easy.admin.modules.huzhou.entity.HuzhouRegulationlab;
 import com.easy.admin.modules.huzhou.service.IHuzhouRegulationlabService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -27,6 +28,8 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 @Service
+@Transactional
+
 public class HuzhouRegulationlabServiceImpl extends ServiceImpl<HuzhouRegulationlabMapper, HuzhouRegulationlab> implements IHuzhouRegulationlabService {
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java

@@ -13,12 +13,15 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
+@Transactional
+
 public class HuzhouSubProjectinfoServiceImpl extends ServiceImpl<HuzhouSubProjectinfoMapper, HuzhouSubProjectinfo> implements IHuzhouSubProjectinfoService {
 
     @Autowired

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUserprojectServiceImpl.java

@@ -48,6 +48,8 @@ import java.util.Map;
  * @since 2024-02-01 09:59:12
  */
 @Service("huzhouUserprojectService")
+@Transactional
+
 public class HuzhouUserprojectServiceImpl extends ServiceImpl<HuzhouUserprojectMapper,HuzhouUserproject> implements IHuzhouUserprojectService {
     /**
      * 从project把人员信息提取并保存

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java

@@ -54,11 +54,14 @@ import org.apache.shiro.SecurityUtils;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
+@Transactional
+
 public class WorkflowServiceImpl implements IWorkflowService {
     @Autowired
     private ActivitiModelService activitiModelService;

huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/HuzhouMergesplitinfoVo.java

@@ -0,0 +1,64 @@
+package com.easy.admin.modules.huzhou.vo;
+
+import com.easy.admin.modules.huzhou.entity.BaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * (HuzhouMergesplitinfo)实体类
+ *
+ * @author makejava
+ * @since 2024-07-18 15:18:04
+ */
+@Data
+public class HuzhouMergesplitinfoVo extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 509578568779634240L;
+    /**
+     * id
+     */
+    private String id;
+    /**
+     * 项目名称
+     */
+    private String projectName;
+    /**
+     * 行政区划
+     */
+    private String adminDivision;
+
+
+    /**
+     * 责任单位
+     */
+    private String dutyWorkplace;
+
+
+    /**
+     * 所属改革任务
+     */
+    private String reformName;
+    /**
+     * 上级指导处室
+     */
+    private String superLeader;
+
+
+
+    /**
+     * 单位属性
+     */
+    private String workplaceProperties;
+
+    /**
+     * 项目id
+     */
+    private List<String> projectids;
+
+    private String projectContacts;
+    private String phone;
+
+}
+