Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/mapper/xml/ProjectListMapper.xml

@@ -41,6 +41,7 @@
             LEFT JOIN sys_user b ON a.create_by = b.id
         WHERE
             a.del_flag = 0
+            and a.status != 1
             <if test="dto.createBy != null and dto.createBy != ''">
                 AND b.id = #{dto.createBy}
             </if>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/mapper/xml/ProofreadInfoMapper.xml

@@ -14,7 +14,7 @@
 			a.project_id,
 			b.`name` AS project_name,
 			b.assessment_date,
-			b.project_manager_name,
+			d.`name` AS project_manager_name,
 			a.process_user_id,
 			c.name AS process_user_name,
 			a.process_date,
@@ -23,6 +23,7 @@
 		FROM proofread_info a
 		LEFT JOIN program_project_list_info b ON a.project_id = b.id
 		LEFT JOIN sys_user c ON a.process_user_id = c.id
+		LEFT JOIN sys_user d ON b.project_manager = d.id
 		WHERE
 			a.del_flag = 0
 			AND a.project_id = #{id}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workClientInfo/controller/WorkClientController.java

@@ -22,7 +22,9 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Api(tags ="workClientInfo")
@@ -115,7 +117,7 @@ public class WorkClientController {
      */
     @ApiOperation(value = "客户信息删除")
     @GetMapping(value = "remove")
-    public String remove(@RequestParam String id) {
+    public Map<String,Object> remove(@RequestParam String id) {
         return workClientService.removeById(id);
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workClientInfo/service/WorkClientService.java

@@ -23,16 +23,15 @@ import com.jeeplus.test.workClientInfo.mapper.WorkClientBankMapper;
 import com.jeeplus.test.workClientInfo.mapper.WorkClientInfoMapper;
 import com.jeeplus.test.workClientInfo.mapper.WorkClientJobTypeInfoMapper;
 import com.jeeplus.test.workClientInfo.mapper.WorkClientLinkmanMapper;
+import com.jeeplus.test.workContract.service.WorkContractService;
+import com.jeeplus.test.workContract.service.dto.WorkContractInfoDto;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.editor.language.json.converter.util.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -55,6 +54,9 @@ public class WorkClientService {
     private WorkClientJobTypeInfoMapper workClientJobTypeInfoMapper;
 
     @Resource
+    private WorkContractService workContractService;
+
+    @Resource
     private OssService ossService;
 
     /**
@@ -145,7 +147,7 @@ public class WorkClientService {
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
 
                 //文件类型处理
-                List<String> strings = Arrays.asList(dto.getName().split("\\."));
+                List<String> strings = Arrays.asList(i.getAttachmentName().split("\\."));
                 if (CollectionUtils.isNotEmpty(strings)) {
                     i.setType(strings.get(1));
                 }
@@ -169,7 +171,16 @@ public class WorkClientService {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public String removeById (String id) {
+    public Map<String,Object> removeById (String id) {
+        Map<String,Object> map = new HashMap();
+        //判断客户是否被合同调用
+        List<WorkContractInfoDto> contractInfoDtoList = workContractService.getInfoByClientId(id);
+        if(null != contractInfoDtoList && contractInfoDtoList.size()>0){
+            map.put("success",false);
+            map.put("message","客户已被引用，无法删除！");
+            return map;
+        }
+
         //客户信息删除
         workClientInfoMapper.deleteById(id);
         //客户行业处理
@@ -188,7 +199,9 @@ public class WorkClientService {
         LambdaQueryWrapper<WorkAttachment> wrapper2 = new LambdaQueryWrapper<>();
         wrapper2.eq(WorkAttachment::getAttachmentId, id);
         ossServiceMapper.delete(wrapper2);
-        return "删除完成!";
+        map.put("success",true);
+        map.put("message","删除成功！");
+        return map;
     }
 
     /**
@@ -397,7 +410,7 @@ public class WorkClientService {
      */
     public IPage<WorkClientInfo> componentList(Page<WorkClientInfo> page, QueryWrapper<WorkClientInfo> queryWrapper) {
         queryWrapper.eq("a.del_flag","0");
-        IPage<WorkClientInfo> pageList = workClientInfoMapper.componentList(page, queryWrapper);
+        IPage<WorkClientInfo> pageList = workClientInfoMapper.findPageList(page, queryWrapper);
         return pageList;
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/WorkContractInfoMapper.java

@@ -9,6 +9,7 @@ import com.jeeplus.test.oss.domain.WorkAttachment;
 import com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo;
 import com.jeeplus.test.workContract.domain.WorkContractInfo;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
+import com.jeeplus.test.workContract.service.dto.WorkContractInfoDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -30,4 +31,11 @@ public interface WorkContractInfoMapper extends BaseMapper<WorkContractInfo> {
     void updateStatusById(@Param("id") String id, @Param("status")String status);
 
     IPage<ProgramProjectListInfo> relationProjectList(@Param("id") String id, Page<ProgramProjectListInfo> page);
+
+    /**
+     * 根据客户id查询合同信息
+     * @param clientId
+     * @return
+     */
+    List<WorkContractInfoDto> getInfoByClientId (@Param("clientId") String clientId);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/xml/WorkContractInfoMapper.xml

@@ -208,4 +208,47 @@
 			a.contract_id = #{id}
             ORDER BY a.update_date DESC
 	</select>
+
+
+
+	<select id="getInfoByClientId" resultType="com.jeeplus.test.workContract.service.dto.WorkContractInfoDto">
+		SELECT
+			a.id,
+			a.client_id,
+			a.client_name,
+			a.`no`,
+			a.`name`,
+			a.contract_date,
+			a.effective_date,
+			a.closing_date,
+			a.contract_type,
+			a.contract_amount_type,
+			a.contract_amount,
+			a.contract_opposite,
+			a.contract_fee,
+			a.fees,
+			a.describes,
+			a.contract_special,
+			a.remarks,
+			a.filed_by,
+			a.filed_date,
+			a.filed_no,
+			d.confirm_filed_no,
+			a.filed_remarks,
+			a.proc_ins_id,
+			a.borrow_type,
+			a.create_date,
+			a.create_by,
+			a.update_date,
+			a.update_by,
+			a.del_flag,
+			d.id as contract_file_id,
+			d.filed_type
+		FROM
+			work_contract_info a
+			LEFT JOIN work_contract_file d ON a.id = d.contract_info_id
+		WHERE
+			a.client_id = #{clientId}
+			AND a.del_flag = 0
+	</select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/WorkContractService.java

@@ -291,4 +291,26 @@ public class WorkContractService {
         IPage<ProgramProjectListInfo> infos = workContractInfoMapper.relationProjectList(id, page);
         return infos;
     }
+
+
+    /**
+     * 根据客户id查询信息
+     * @param clientId
+     * @return
+     */
+    public List<WorkContractInfoDto> getInfoByClientId(String clientId) {
+        List<WorkContractInfoDto> infoList = workContractInfoMapper.getInfoByClientId(clientId);
+        if (null != infoList && infoList.size()>0) {
+            for (WorkContractInfoDto info: infoList) {
+                // 查询附件信息
+                List<WorkAttachmentDto> dtos = workContractInfoMapper.findDtos(info.getId());
+                if (CollectionUtils.isNotEmpty(dtos)) {
+                    for (WorkAttachmentDto i : dtos) {
+                        i.setCreateBy(UserUtils.get(i.getBy()));
+                    }
+                }
+            }
+        }
+        return infoList;
+    }
 }

jeeplus-web/src/main/resources/application-production.yml

@@ -210,3 +210,6 @@ yy_shcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpris
 
 # 公共密码
 publicPassword: jsxgpassword
+
+#阿里云文件夹路径
+aliyun_directory: attachment-file/assess