嘉溢项目bug调整

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/controller/JyProjectController.java

@@ -140,6 +140,15 @@ public class JyProjectController {
     }
 
 
+    /**
+     * 根据id获取三级校审信息
+     */
+//    @ApiOperation(value = "根据id获取三级校审信息")
+//    @GetMapping(value = "/get")
+
+
+
+
 
 
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/domain/JyProject.java

@@ -180,6 +180,83 @@ public class JyProject extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private String projectId;
 
+    /**
+     * 一级校审id
+     */
+    @TableField(exist = false)
+    private String auditId1;
+
+    /**
+     * 二级校审id
+     */
+    @TableField(exist = false)
+    private String auditId2;
+
+    /**
+     * 三级校审id
+     */
+    @TableField(exist = false)
+    private String auditId3;
+
+    /**
+     * 一级校审流程id
+     */
+    @TableField(exist = false)
+    private String procInsId1;
+
+    /**
+     * 二级校审流程id
+     */
+    @TableField(exist = false)
+    private String procInsId2;
+
+    /**
+     * 三级校审流程id
+     */
+    @TableField(exist = false)
+    private String procInsId3;
+
+    /**
+     * 一级校审  taskId
+     */
+    @TableField(exist = false)
+    private String taskIdAudit1;
+
+    /**
+     * 二级校审  taskId
+     */
+    @TableField(exist = false)
+    private String taskIdAudit2;
+
+    /**
+     * 三级校审  taskId
+     */
+    @TableField(exist = false)
+    private String taskIdAudit3;
+
+    /**
+     * 数据审核人  一级校审
+     */
+    @TableField(exist = false)
+    private String auditUserIds1;
+
+    /**
+     * 数据审核人  二级校审
+     */
+    @TableField(exist = false)
+    private String auditUserIds2;
+
+    /**
+     * 数据审核人  三级校审
+     */
+    @TableField(exist = false)
+    private String auditUserIds3;
+
+    /**
+     * 超期状态
+     */
+    private String exceedTimeStatus;
+
 
 
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/domain/JyProjectMembers.java

@@ -45,5 +45,12 @@ public class JyProjectMembers extends BaseEntity implements Serializable {
 
     @TableField(exist = false)
     private String name;
+    @TableField(exist = false)
+    private String officeName;
+    @TableField(exist = false)
+    private String roleName;
+    @TableField(exist = false)
+    private String mobile;
+
 
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/mapper/xml/ProjectListMapper.xml

@@ -80,9 +80,6 @@
            a.client,
            a.client_name,
            a.status,
-           a.first_instance_status,
-           a.second_instance_status,
-           a.third_instance_status,
            a.report_issuance,
            a.out_instance,
            a.reports_submit,
@@ -98,7 +95,20 @@
            a.process_definition_id,
            b.name AS create_by_id,
            art.ID_ as taskId,
-           wci.primary_linkman as primaryLinkman
+           wci.primary_linkman as primaryLinkman,
+           pa1.status as firstInstanceStatus,
+           pa1.id as auditId1,
+           pa1.proc_ins_id as procInsId1,
+           pa1.exceed_time_status as exceedTimeStatus,
+           pa2.status as secondInstanceStatus,
+           pa2.id as auditId2,
+           pa2.proc_ins_id as procInsId2,
+           pa3.status as thirdInstanceStatus,
+           pa3.id as auditId3,
+           pa3.proc_ins_id as procInsId3,
+           art1.ID_ as task_id_audit1,
+           art2.ID_ as task_id_audit2,
+           art3.ID_ as task_id_audit3
         FROM
             jy_project_record a
             LEFT JOIN sys_user b ON a.create_by_id = b.id
@@ -106,6 +116,12 @@
             LEFT JOIN jy_work_contract_info wci ON wci.id = a.contract_id and wci.del_flag = '0'
             left join jy_project_members pm on a.id = pm.project_id
             LEFT JOIN act_ru_task art ON a.proc_ins_id = art.PROC_INST_ID_
+            left join jy_project_audit pa1 on pa1.project_id = a.id and pa1.audit_level = '1' and pa1.del_flag = '0'
+            LEFT JOIN jy_project_audit pa2 ON pa2.project_id = a.id and pa2.audit_level = '2' and pa2.del_flag = '0'
+            LEFT JOIN jy_project_audit pa3 ON pa3.project_id = a.id and pa3.audit_level = '3' and pa3.del_flag = '0'
+            LEFT JOIN act_ru_task art1 ON pa1.proc_ins_id = art1.PROC_INST_ID_
+            LEFT JOIN act_ru_task art2 ON pa2.proc_ins_id = art2.PROC_INST_ID_
+            LEFT JOIN act_ru_task art3 ON pa3.proc_ins_id = art3.PROC_INST_ID_
             ${ew.customSqlSegment}
             ORDER BY a.create_time DESC
     </select>

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/service/JyProjectService.java

@@ -272,6 +272,7 @@ public class JyProjectService {
             jyProjectMembers.setUpdateTime(new Date());
             jyProjectMembers.setProjectId(id);
             jyProjectMembers.setUserId(string);
+            jyProjectMembers.setStatus("0");
             jyProjectMemberMapper.insert(jyProjectMembers);
         }
 
@@ -422,6 +423,10 @@ public class JyProjectService {
                     UserDTO byId = SpringUtil.getBean ( IUserApi.class ).getById(member.getUserId());
                     if (ObjectUtil.isNotEmpty(byId)) {
                         member.setName(byId.getName());
+//                        member.setOfficeName(byId.getOfficeDTO().getName());
+//                        member.setRoleName(byId.getRoleDTO().getName());
+//                        member.setMobile(byId.getMobile());
+                        member.setStatus("0");
                     }
                 }
             });

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/useSeal/mapper/xml/SignetMapper.xml

@@ -17,8 +17,8 @@
             a.remarks,
             so.name as office,
             so.id,
-            a.proc_ins_id,
-            a.process_definition_id,
+            a.proc_ins_id as procInsId ,
+            a.process_definition_id as processDefinitionId,
             art.ID_ as task_id
             from  jy_user_signet a
             left join sys_user su on a.create_by_id = su.id

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/useSeal/service/SignetService.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.business.project.domain.JyProject;
 import com.jeeplus.business.project.mapper.JyProjectMapper;
 import com.jeeplus.business.project.service.dto.JyProjectDTO;
+import com.jeeplus.business.workContractInfo.mapper.JyWorkContractInfoMapper;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
@@ -24,6 +25,7 @@ import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.utils.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,6 +45,9 @@ public class SignetService {
     @Resource
     private JyProjectMapper jyProjectMapper;
 
+    @Autowired
+    private JyWorkContractInfoMapper jyWorkContractInfoMapper;
+
 
 
     /**
@@ -192,6 +197,10 @@ public class SignetService {
         signet.setStatus(dto.getStatus());//状态
         signet.setNumber(dto.getNumber()); //份数
         signetMapper.updateById(signet);
+        // 修改附件信息
+        if (CollectionUtils.isNotEmpty(dto.getFiles())) {
+            updateFiles(dto.getFiles(), userDTO, dto.getId());
+        }
         return dto.getId();
     }
 
@@ -202,9 +211,9 @@ public class SignetService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id) {
+    public void saveFiles(List<WorkAttachmentInfo> list, UserDTO userDTO, String id) {
         int j = 1;
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfo dto : list) {
             WorkAttachment i = new WorkAttachment();
             //包含了url、size、name
             i.setId(UUID.randomUUID().toString().replace("-", ""));
@@ -242,11 +251,11 @@ public class SignetService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void updateFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id) {
+    public void updateFiles(List<WorkAttachmentInfo> list, UserDTO userDTO, String id) {
         int j = 1;
         String names = new String();
         //表中存在，但是传过来不存在，说明已删除，表中数据也要删除
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfo dto : list) {
             names = names + "," +dto.getUrl();
         }
         //查询保存的附件信息
@@ -260,7 +269,7 @@ public class SignetService {
             }
         }
         //保存信息
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfo dto : list) {
             //判断是否存在
             Integer isExit = signetMapper.findIsExit(id, dto.getName());
             if (isExit == 0) {
@@ -323,6 +332,14 @@ public class SignetService {
         }
         signetDTO.setTypes(stringList);
         signetDTO.setCreateById(dto.getCreateById());
+        // 查询附件信息
+        List<WorkAttachmentInfo> files = jyWorkContractInfoMapper.findDtos(id);
+        if (CollectionUtils.isNotEmpty(files)) {
+            for (WorkAttachmentInfo i : files) {
+                i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
+            }
+            signetDTO.setFiles(files);
+        }
         return  signetDTO;
     }
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/useSeal/service/dto/SignetDTO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.business.project.domain.JyProject;
 import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import lombok.Data;
 
 import java.util.Date;
@@ -95,7 +96,7 @@ public class SignetDTO  {
     /**
      * 附件
      */
-    private List<WorkAttachmentDto> files;
+    private List<WorkAttachmentInfo> files;
 
     private List<JyProject> projectList;
     /**

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workClientInfo/mapper/JyWorkClientLinkmanMapper.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import com.jeeplus.business.workClientInfo.domain.JyWorkClientLinkman;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface JyWorkClientLinkmanMapper extends BaseMapper<JyWorkClientLinkman> {
+    JyWorkClientLinkman selectByClientId(@Param("client") String client);
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workClientInfo/service/JyWorkClientService.java

@@ -125,6 +125,7 @@ public class JyWorkClientService {
                 i.setUpdateById(dto.getId());
                 i.setUpdateTime(new Date());
                 i.setClientId(id);
+                i.setDelFlag(0);
                 jyWorkClientBankMapper.insert(i);
             });
         }
@@ -138,6 +139,7 @@ public class JyWorkClientService {
                 i.setUpdateById(dto.getId());
                 i.setUpdateTime(new Date());
                 i.setClientId(id);
+                i.setDelFlag(0);
                 jyWorkClientLinkmanMapper.insert(i);
             });
         }
@@ -276,7 +278,7 @@ public class JyWorkClientService {
                 JyWorkClientJobTypeInfo info = new JyWorkClientJobTypeInfo();
                 info.setWorkClientId(workClientInfo.getId());
                 info.setJobTypeId(i);
-                jyWorkClientJobTypeInfoMapper.insert(info);
+                jyWorkClientJobTypeInfoMapper.updateById(info);
             });
         }
         workClientInfo.setUpdateById(dto.getId());
@@ -297,7 +299,7 @@ public class JyWorkClientService {
                 i.setUpdateById(dto.getId());
                 i.setUpdateTime(new Date());
                 i.setClientId(workClientInfo.getId());
-                jyWorkClientBankMapper.insert(i);
+                jyWorkClientBankMapper.updateById(i);
             });
         }
         //联系人信息处理
@@ -313,7 +315,7 @@ public class JyWorkClientService {
                 i.setUpdateById(dto.getId());
                 i.setUpdateTime(new Date());
                 i.setClientId(workClientInfo.getId());
-                jyWorkClientLinkmanMapper.insert(i);
+                jyWorkClientLinkmanMapper.updateById(i);
             });
         }
         //附件信息处理

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/domain/JyContractParticipant.java

@@ -22,6 +22,6 @@ public class JyContractParticipant extends BaseEntity {
     @TableField(exist = false)
     private String name;
     @TableField(exist = false)
-    private String no;
+    private String number;
 
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/service/JyWorkContractService.java

@@ -64,10 +64,10 @@ public class JyWorkContractService {
         }
         if (contractAmounts != null) {
             if (StringUtils.isNotEmpty(contractAmounts[0])) {
-                queryWrapper.ge("a.contract_amount", contractAmounts[0]);
+                queryWrapper.ge("a.contract_amount", Double.parseDouble(contractAmounts[0]));
             }
-            if (StringUtils.isNotEmpty(contractAmounts[1])) {
-                queryWrapper.le("a.contract_amount", contractAmounts[1]);
+            if (contractAmounts.length>1 && StringUtils.isNotEmpty(contractAmounts[1])) {
+                queryWrapper.le("a.contract_amount", Double.parseDouble(contractAmounts[1]));
             }
         }
         if (StringUtils.isNotEmpty(no)){
@@ -192,7 +192,7 @@ public class JyWorkContractService {
                     participant.setId(parId);
                     participant.setContractInfoId(id);
                     participant.setCustomerName(cw.getName());
-                    participant.setCustomerNo(cw.getNo());
+                    participant.setCustomerNo(cw.getNumber());
                     participant.setCreateById(userDTO.getId());
                     participant.setCreateTime(workContractInfoDto.getCreateTime());
                     participant.setUpdateById(userDTO.getId());
@@ -277,7 +277,7 @@ public class JyWorkContractService {
                 byInfoId.forEach(cw->{
                     JyContractParticipant jyContractParticipant = new JyContractParticipant();
                     jyContractParticipant.setName(cw.getCustomerName());
-                    jyContractParticipant.setNo(cw.getCustomerNo());
+                    jyContractParticipant.setNumber(cw.getCustomerNo());
                     list.add(jyContractParticipant);
                 });
                 dto.setCwWorkClientContactDTOList(list);
@@ -286,24 +286,37 @@ public class JyWorkContractService {
             StringBuffer stringBuffer = new StringBuffer();
             String newType="";
             List<String> stringList = new ArrayList<>();
+            ArrayList<List<String>> jyWorkContractInfos = new ArrayList<>();
             if (!info.getContractType().contains(",")){
-                String type= jyWorkContractInfoMapper.findType(info.getContractType());
-                info.setContractType(type);
+//                String type= jyWorkContractInfoMapper.findType(info.getContractType());
+//                info.setContractType(type);
+                stringList.add(info.getContractTypeFirst());
+                stringList.add(info.getContractType());
+                jyWorkContractInfos.add(stringList);
             }else {
                 String[] split = info.getContractType().split(",");
+                Integer count=0;
+                //将切割好的二级类型进行遍历,与一级类型一起存放到数组中,方便前端级联回显
                 for (String s : split) {
-                    String type= jyWorkContractInfoMapper.findType2(s);
-                    stringBuffer.append(type+",");
-                    newType=stringBuffer.substring(0,stringBuffer.lastIndexOf(","));
-                    info.setContractType(newType);
-                    stringList.add(info.getContractType());
+//                    String type= jyWorkContractInfoMapper.findType2(s);
+//                    stringBuffer.append(type+",");
+//                    newType=stringBuffer.substring(0,stringBuffer.lastIndexOf(","));
+//                    info.setContractType(newType);
+//                    stringList.add(info.getContractType());
+                    //创建一个集合副本,为了避免每次新增时会在stringList中进行追加,从而造成回显失败
+                    List<String> newList = new ArrayList<>(stringList);
+                    newList.add(info.getContractTypeFirst());
+                    newList.add(s);
+                    //将集合副本存入到集合中,在前端取值进行回显
+                    jyWorkContractInfos.add(count++,newList);
                 }
+
             }
 
             List<String> result = Arrays.asList(dto.getContractType().split(","));
             dto.setContractTypeList(result);
-            ArrayList<List<String>> jyWorkContractInfos = new ArrayList<>();
-            jyWorkContractInfos.add(stringList);
+
+//            jyWorkContractInfos.add(stringList);
             dto.setContractTypes(jyWorkContractInfos);
         }
 

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/modules/flowable/listener/JyProjectExecutionListener.java

@@ -68,17 +68,16 @@ public class JyProjectExecutionListener implements ExecutionListener {
                 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
                 UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getById(flow.getAssigneeId());
-                OfficeDTO officeDTO = userDTO.getOfficeDTO();
+                //获取到办公室下的人员信息
+                List<UserDTO> listByOfficeId = SpringUtil.getBean(IUserApi.class).findListByOfficeId("1706589732237684737");
                 //如果是嘉溢发送的项目登记，则会给办公室进行抄送
-                if(null != officeDTO && "办公室".equals(officeDTO.getName())){
                     //获取角色为“办公室”的角色对应人员信息
-                    List<UserDTO> userDTOList = SpringUtil.getBean(IUserApi.class).getUserInfoByEnName("bgs");
-                    for (UserDTO dto : userDTOList) {
+                    for (UserDTO dto : listByOfficeId) {
                         SpringUtil.getBean(MyNoticeService.class).add(task.getProcInstId(),titleName,task.getProcDefId(),actName,
                                 flow.getAssigneeName(),format.format(flow.getHistIns().getEndTime()),
                                 dto.getName(),dto.getId(),userDTO.getId());
                     }
-                }
+
 
             }