Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/mould/service/SerialnumTplService.java

@@ -72,68 +72,71 @@ public class SerialnumTplService {
     }
 
     @Transactional(readOnly = false,propagation = Propagation.REQUIRES_NEW)
-    public String genSerialNumNotNum(String companyId, String bizCode) throws Exception {
+    public String genSerialNum(String companyId, String bizCode) throws Exception {
         //获取当前登录人信息
         UserDTO dto = UserUtils.getCurrentUserDTO();
         Office office = officeMapper.selectById(companyId);
         if (StringUtils.isBlank(bizCode)){
             throw new Exception("生成编号失败，业务类型不能为空");
         }
-        SysSerialnumTpl numTpl = this.querySerialTpl(office, bizCode);
-        if (numTpl==null){
-            //查询编号模板   {brspnm}DZ-{year}-{serialNum}
-            SysSerialnumTpl serialNumTpl = serialnumTplMapper.queryByComAndBizCode("0", bizCode);
-            serialNumTpl.setCompanyId(companyId);
-            serialNumTpl.setSerialNum(0);
-            serialNumTpl.setCreateBy(dto.getId());
-            serialNumTpl.setId(UUID.randomUUID().toString().replace("-", ""));
-            serialnumTplMapper.insert(serialNumTpl);
-            numTpl = serialNumTpl;
+        if (office != null) {
+            SysSerialnumTpl numTpl = this.querySerialTpl(office, bizCode);
+            if (numTpl == null) {
+                //查询编号模板   {brspnm}DZ-{year}-{serialNum}
+                SysSerialnumTpl serialNumTpl = serialnumTplMapper.queryByComAndBizCode("0", bizCode);
+                serialNumTpl.setCompanyId(companyId);
+                serialNumTpl.setSerialNum(0);
+                serialNumTpl.setCreateBy(dto.getId());
+                serialNumTpl.setId(UUID.randomUUID().toString().replace("-", ""));
+                serialnumTplMapper.insert(serialNumTpl);
+                numTpl = serialNumTpl;
+            }
+            if (numTpl == null) {
+                throw new Exception("生成编号失败，请先设置相关业务编号模板");
+            }
+            String year = DateUtils.formatDate(new Date(), "yyyy");
+            if (!year.equals(numTpl.getYearBuilt())) {
+                serialnumTplMapper.resetSerialNum(numTpl.getId(), numTpl.getYearBuilt(), year);
+            }
+            Map<String, String> map = new HashMap<>();
+            String serialTpl = numTpl.getSerialTpl();
+            int i = serialnumTplMapper.updateSerialNum(numTpl);
+            if (i != 1) {
+                throw new Exception("生成编号失败，请稍后重试");
+            }
+            String num = String.valueOf(numTpl.getSerialNum() + 1);
+            StringBuffer sb = new StringBuffer();
+            for (int x = 0; x < (numTpl.getSerialNumLen() - num.length()); x++) {
+                sb.append("0");
+            }
+            sb.append(num);
+            //查询公司简称
+            if (serialTpl.contains("spnm")) {
+                String companyShortname = UserUtils.getSysParam("company_shortname");
+                map.put("spnm", StringUtils.isBlank(companyShortname) ? "" : companyShortname);
+            }
+            //查询分公司简称
+            if (serialTpl.contains("brspnm")) {
+                String branchShortname = UserUtils.getSysParam("branch_shortname");
+                map.put("brspnm", StringUtils.isBlank(branchShortname) ? "" : branchShortname);
+            }
+            //年份
+            if (serialTpl.contains("year")) {
+                map.put("year", year);
+            }
+            //月份
+            if (serialTpl.contains("month")) {
+                int month = new Date().getMonth() + 1;
+                map.put("month", month + "");
+            }
+            //序列号
+            if (serialTpl.contains("serialNum")) {
+                map.put("serialNum", sb.toString());
+            }
+            String serNum = StringUtils.renderString(serialTpl, map);
+            return serNum;
         }
-        if (numTpl==null){
-            throw new Exception("生成编号失败，请先设置相关业务编号模板");
-        }
-        String year = DateUtils.formatDate(new Date(), "yyyy");
-        if(!year.equals(numTpl.getYearBuilt())){
-            serialnumTplMapper.resetSerialNum(numTpl.getId(),numTpl.getYearBuilt(),year);
-        }
-        Map<String, String> map = new HashMap<>();
-        String serialTpl = numTpl.getSerialTpl();
-        int i =serialnumTplMapper.updateSerialNum(numTpl);
-        if (i!=1){
-            throw new Exception("生成编号失败，请稍后重试");
-        }
-        String num = String.valueOf(numTpl.getSerialNum() + 1);
-        StringBuffer sb = new StringBuffer();
-        for(int x = 0; x < (numTpl.getSerialNumLen() - num.length()); x++) {
-            sb.append("0");
-        }
-        sb.append(num);
-        //查询公司简称
-        if (serialTpl.contains("spnm")) {
-            String companyShortname = UserUtils.getSysParam("company_shortname");
-            map.put("spnm", StringUtils.isBlank(companyShortname) ? "" : companyShortname);
-        }
-        //查询分公司简称
-        if (serialTpl.contains("brspnm")) {
-            String branchShortname = UserUtils.getSysParam("branch_shortname");
-            map.put("brspnm", StringUtils.isBlank(branchShortname) ? "" : branchShortname);
-        }
-        //年份
-        if (serialTpl.contains("year")) {
-            map.put("year", year);
-        }
-        //月份
-        if (serialTpl.contains("month")) {
-            int month = new Date().getMonth() + 1;
-            map.put("month", month+"");
-        }
-        //序列号
-        if (serialTpl.contains("serialNum")) {
-            map.put("serialNum", sb.toString());
-        }
-        String serNum = StringUtils.renderString(serialTpl, map);
-        return serNum;
+        return "";
     }
 
     private SysSerialnumTpl querySerialTpl(Office company, String bizCode) {

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/controller/WorkContractController.java

@@ -0,0 +1,84 @@
+package com.jeeplus.test.workContract.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.sys.utils.TicketQueryUtils;
+import com.jeeplus.test.workClientInfo.domain.WorkClientInfo;
+import com.jeeplus.test.workClientInfo.domain.dto.WorkClientInfosDto;
+import com.jeeplus.test.workClientInfo.service.WorkClientService;
+import com.jeeplus.test.workContract.domain.WorkContractInfo;
+import com.jeeplus.test.workContract.service.WorkContractService;
+import com.jeeplus.test.workContract.service.dto.WorkContractInfoDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@Api(tags ="合同登记")
+@RestController
+@RequestMapping(value = "/workContract/workContractInfo")
+public class WorkContractController {
+
+    @Resource
+    private WorkContractService workContractService;
+
+    /**
+     * 合同登记列表
+     */
+    @ApiOperation(value = "合同登记列表")
+    @GetMapping(value = "list")
+    public ResponseEntity<IPage<WorkContractInfo>> list(WorkContractInfo workClientInfo, Page<WorkContractInfo> page) throws Exception {
+        String clientName = workClientInfo.getClientName();
+        String[] contractDates = workClientInfo.getContractDates();
+        String[] contractAmounts = workClientInfo.getContractAmounts();
+        QueryWrapper<WorkContractInfo> workContractInfoQueryWrapper = QueryWrapperGenerator.buildQueryCondition(workClientInfo, WorkContractInfo.class);
+        IPage<WorkContractInfo> list = workContractService.list(page, workContractInfoQueryWrapper, clientName, contractDates, contractAmounts);
+        return ResponseEntity.ok (list);
+    }
+
+    /**
+     * 合同登记新增/修改
+     */
+    @ApiOperation(value = "合同登记新增/修改")
+    @PostMapping(value = "save")
+    public ResponseEntity save(@RequestBody WorkContractInfoDto workContractInfoDto) throws Exception{
+        if (StringUtils.isEmpty(workContractInfoDto.getId())) {
+            //新增
+            workContractService.add(workContractInfoDto);
+            return ResponseEntity.ok("操作成功");
+        }else {
+            //修改
+            workContractService.update(workContractInfoDto);
+            return ResponseEntity.ok("操作成功");
+        }
+    }
+
+    /**
+     * 客户信息删除
+     */
+    @ApiOperation(value = "合同登记删除")
+    @GetMapping(value = "remove")
+    public String remove(@RequestParam String id) {
+        return workContractService.removeById(id);
+    }
+
+    /**
+     * 客户信息查询
+     */
+    @ApiOperation(value = "合同登记查询")
+    @GetMapping(value = "findById")
+    public WorkContractInfoDto findById(@RequestParam String id) {
+        return workContractService.findById(id);
+    }
+
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/domain/WorkContractInfo.java

@@ -0,0 +1,139 @@
+package com.jeeplus.test.workContract.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.query.Query;
+import lombok.Data;
+
+@Data
+@TableName("work_contract_info")
+public class WorkContractInfo extends BaseEntity {
+
+    /**
+     * 客户id
+     */
+    private String clientId;
+
+    /**
+     * 合同编号
+     */
+    private String no;
+
+    /**
+     * 合同名称
+     */
+    @Query(tableColumn = "a.name")
+    private String name;
+
+    /**
+     * 签订日期
+     */
+    @Query(tableColumn = "a.contractDate")
+    private String contractDate;
+
+    /**
+     * 合同生效日期
+     */
+    private String effectiveDate;
+
+    /**
+     * 合同终止日期
+     */
+    private String closingDate;
+
+    /**
+     * 合同类型
+     */
+    private String contractType;
+
+    /**
+     * 合同金额类别
+     */
+    private String contractAmountType;
+
+    /**
+     * 合同金额
+     */
+    @Query(tableColumn = "a.contractAmount")
+    private String contractAmount;
+
+    /**
+     * 对方合同编号
+     */
+    private String contractOpposite;
+
+    /**
+     * 收费标准
+     */
+    private String contractFee;
+
+    /**
+     * 描述
+     */
+    private String describes;
+
+    /**
+     * 合同特别条款
+     */
+    private String contractSpecial;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 归档人
+     */
+    private String filedBy;
+
+    /**
+     * 归档日期
+     */
+    private String filedDate;
+
+    /**
+     * 案卷号
+     */
+    private String filedNo;
+
+    /**
+     * 确认案卷号
+     */
+    private String confirmFiledNo;
+
+    /**
+     * 说明
+     */
+    private String filedRemarks;
+
+    /**
+     * 状态
+     */
+    @Query
+    private String type;
+
+    /**
+     * 归档状态
+     */
+    @Query
+    private String filedType;
+
+    /**
+     * 借用状态
+     */
+    private String borrowType;
+
+    /**
+     * 客户名称
+     */
+    @TableField(exist = false)
+    private String clientName;
+
+    @TableField(exist = false)
+    private String[] contractDates;
+
+    @TableField(exist = false)
+    private String[] contractAmounts;
+}

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

@@ -0,0 +1,17 @@
+package com.jeeplus.test.workContract.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.test.workClientInfo.domain.WorkClientInfo;
+import com.jeeplus.test.workContract.domain.WorkContractInfo;
+import org.apache.ibatis.annotations.Param;
+
+public interface WorkContractInfoMapper extends BaseMapper<WorkContractInfo> {
+
+    IPage<WorkContractInfo> findPageList(Page<WorkContractInfo> page, @Param(Constants.WRAPPER)QueryWrapper queryWrapper);
+
+    WorkContractInfo findById (@Param("id") String id);
+}

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

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.test.workContract.mapper.WorkContractInfoMapper">
+
+	<select id="findPageList" resultType="com.jeeplus.test.workContract.domain.WorkContractInfo">
+		SELECT
+			a.id,
+			c.`name` AS create_by,
+			a.create_date,
+			a.update_by,
+			a.update_date,
+			a.del_flag,
+			a.client_id,
+			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.describes,
+			a.contract_special,
+			a.remarks,
+			a.filed_by,
+			a.filed_date,
+			a.filed_no,
+			a.confirm_filed_no,
+			a.filed_remarks,
+			a.`type`,
+			a.filed_type,
+			a.borrow_type,
+			b.`name` AS client_name
+		FROM
+			work_contract_info a
+			LEFT JOIN work_client_info b ON a.client_id = b.id
+			LEFT JOIN sys_user c ON a.create_by = c.id
+		${ew.customSqlSegment}
+		ORDER BY a.update_date DESC
+	</select>
+
+	<select id="findById" resultType="com.jeeplus.test.workContract.domain.WorkContractInfo">
+		SELECT
+			id,
+			client_id,
+			`no`,
+			`name`,
+			contract_date,
+			effective_date,
+			closing_date,
+			contract_type,
+			contract_amount_type,
+			contract_amount,
+			contract_opposite,
+			contract_fee,
+			describes,
+			contract_special,
+			remarks,
+			filed_by,
+			filed_date,
+			filed_no,
+			confirm_filed_no,
+			filed_remarks,
+			type,
+			filed_type,
+			borrow_type,
+			create_date,
+			create_by,
+			update_date,
+			update_by,
+			del_flag
+		FROM
+			work_contract_info
+		WHERE
+			id = #{id}
+			AND del_flag = 0
+	</select>
+</mapper>

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

@@ -0,0 +1,170 @@
+package com.jeeplus.test.workContract.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jeeplus.sys.utils.TicketQueryUtils;
+import com.jeeplus.test.oss.service.OssService;
+import com.jeeplus.test.workClientInfo.domain.WorkClientInfo;
+import com.jeeplus.test.workClientInfo.domain.dto.WorkClientInfosDto;
+import com.jeeplus.test.workClientInfo.mapper.WorkClientInfoMapper;
+import com.jeeplus.test.workClientInfo.service.WorkClientService;
+import net.sf.json.JSONObject;
+import org.flowable.editor.language.json.converter.util.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.sys.utils.UserUtils;
+import com.jeeplus.test.mould.service.SerialnumTplService;
+import com.jeeplus.test.oss.domain.WorkAttachment;
+import com.jeeplus.test.oss.mapper.OssServiceMapper;
+import com.jeeplus.test.workContract.domain.WorkContractInfo;
+import com.jeeplus.test.workContract.mapper.WorkContractInfoMapper;
+import com.jeeplus.test.workContract.service.dto.WorkContractInfoDto;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class WorkContractService {
+
+    @Resource
+    private WorkContractInfoMapper workContractInfoMapper;
+
+    @Resource
+    private WorkClientService workClientService;
+
+    @Resource
+    private OssServiceMapper ossServiceMapper;
+
+    @Resource
+    private OssService ossService;
+
+    @Resource
+    private SerialnumTplService serialnumTplService;
+
+    private final String BIZ_CODE = "htdj";
+
+    /**
+     * 客户信息列表
+     * @param
+     * @return
+     */
+    public IPage<WorkContractInfo> list(Page<WorkContractInfo> page, QueryWrapper<WorkContractInfo> queryWrapper, String clientName, String[] contractDates, String[] contractAmounts) {
+        queryWrapper.eq("a.del_flag","0");
+        if (StringUtils.isNotEmpty(clientName)) {
+            queryWrapper.like("b.name", clientName);
+        }
+        if (contractDates != null) {
+            queryWrapper.between("a.contract_date", contractDates[0], contractDates[1]);
+        }
+        if (contractAmounts != null) {
+            if (StringUtils.isNotEmpty(contractAmounts[0])) {
+                queryWrapper.ge("a.contract_amount", contractAmounts[0]);
+            }
+            if (StringUtils.isNotEmpty(contractAmounts[1])) {
+                queryWrapper.le("a.contract_amount", contractAmounts[1]);
+            }
+        }
+        IPage<WorkContractInfo> pageList = workContractInfoMapper.findPageList(page, queryWrapper);
+        return pageList;
+    }
+
+    /**
+     * 合同登记新增
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public String add(WorkContractInfoDto workContractInfoDto) throws Exception{
+        //获取当前登录人信息
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        //合同编号生成
+        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), BIZ_CODE);
+        String id = UUID.randomUUID().toString().replace("-", "");
+        WorkContractInfo info = new WorkContractInfo();
+        BeanUtils.copyProperties(workContractInfoDto, info);
+        info.setId(id);
+        info.setNo(serialNum);
+        info.setCreateBy(userDTO.getId());
+        info.setCreateDate(new Date());
+        info.setUpdateBy(userDTO.getId());
+        info.setUpdateDate(new Date());
+        workContractInfoMapper.insert(info);
+        List<WorkAttachment> list = workContractInfoDto.getWorkAttachmentList();
+        if (CollectionUtils.isNotEmpty(list)) {
+            int j = 1;
+            for (WorkAttachment i : list) {
+                i.setId(UUID.randomUUID().toString().replace("-", ""));
+                i.setCreateBy(userDTO.getId());
+                i.setCreateDate(new Date());
+                i.setUpdateBy(userDTO.getId());
+                i.setUpdateDate(new Date());
+                i.setAttachmentId(id);
+                i.setSort(j);
+                ossServiceMapper.insert(i);
+                j++;
+            }
+        }
+        return "操作完成";
+    }
+
+    /**
+     * 合同登记修改
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public String update(WorkContractInfoDto workContractInfoDto) throws Exception{
+        //获取当前登录人信息
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        //合同编号生成
+        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), BIZ_CODE);
+        WorkContractInfo info = new WorkContractInfo();
+        BeanUtils.copyProperties(workContractInfoDto, info);
+        info.setNo(serialNum);
+        info.setUpdateBy(userDTO.getId());
+        info.setUpdateDate(new Date());
+        workContractInfoMapper.updateById(info);
+        List<WorkAttachment> list = workContractInfoDto.getWorkAttachmentList();
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.stream().forEach(i -> i.setAttachmentId(info.getId()));
+            ossService.saveMsg(list);
+        }
+        return "操作完成";
+    }
+
+    /**
+     * 合同登记删除
+     */
+    public String removeById(String id) {
+        workContractInfoMapper.deleteById(id);
+        // 附件删除
+        LambdaQueryWrapper<WorkAttachment> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WorkAttachment::getAttachmentId, id);
+        ossServiceMapper.delete(wrapper);
+        return "删除完成!";
+    }
+
+    /**
+     * 合同登记查询
+     */
+    public WorkContractInfoDto findById(String id) {
+        WorkContractInfoDto dto = new WorkContractInfoDto();
+        WorkContractInfo info = workContractInfoMapper.findById(id);
+        BeanUtils.copyProperties(info, dto);
+        // 查询客户信息
+        if (StringUtils.isNotEmpty(dto.getClientId())) {
+            String s = TicketQueryUtils.enterpriseTicketInfoQueryById(dto.getClientId());
+            JSONObject jsonObject = JSONObject.fromObject(s);
+            dto.setClientName(jsonObject.getString("ENTNAME"));
+        }
+        // 查询附件信息
+        LambdaQueryWrapper<WorkAttachment> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WorkAttachment::getAttachmentId, id);
+        wrapper.orderByAsc(WorkAttachment::getSort);
+        dto.setWorkAttachmentList(ossServiceMapper.selectList(wrapper));
+        return dto;
+    }
+}

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

@@ -0,0 +1,92 @@
+package com.jeeplus.test.workContract.service.dto;
+
+import com.jeeplus.core.service.dto.BaseDTO;
+import com.jeeplus.test.oss.domain.WorkAttachment;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WorkContractInfoDto extends BaseDTO {
+
+    /**
+     * 客户id
+     */
+    private String clientId;
+
+    /**
+     * 客户名称
+     */
+    private String clientName;
+
+    /**
+     * 合同编号
+     */
+    private String no;
+
+    /**
+     * 合同名称
+     */
+    private String name;
+
+    /**
+     * 签订日期
+     */
+    private String contractDate;
+
+    /**
+     * 合同生效日期
+     */
+    private String effectiveDate;
+
+    /**
+     * 合同终止日期
+     */
+    private String closingDate;
+
+    /**
+     * 合同类型
+     */
+    private String contractType;
+
+    /**
+     * 合同金额类别
+     */
+    private String contractAmountType;
+
+    /**
+     * 合同金额
+     */
+    private String contractAmount;
+
+    /**
+     * 对方合同编号
+     */
+    private String contractOpposite;
+
+    /**
+     * 收费标准
+     */
+    private String contractFee;
+
+    /**
+     * 描述
+     */
+    private String describes;
+
+    /**
+     * 合同特别条款
+     */
+    private String contractSpecial;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 附件信息
+     */
+    private List<WorkAttachment> workAttachmentList;
+
+}