From 94fc07774a552edc838ab68dc72a89eed8888665 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 20 一月 2024 17:40:04 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 444 +++++++++++++++++++++++++++++++++
server/service/src/main/java/com/doumee/dao/business/join/ApplyChagneDetailJoinMapper.java | 13 +
server/service/src/main/java/com/doumee/service/business/ApplyChangeService.java | 8
server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java | 71 +++++
server/service/src/main/java/com/doumee/core/utils/Constants.java | 106 ++++++++
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 33 +
server/service/src/main/java/com/doumee/dao/business/join/ApplyChangeJoinMapper.java | 13 +
server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java | 4
server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java | 16 +
server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java | 9
server/service/src/main/java/com/doumee/dao/business/dto/ApplyChangeOptDTO.java | 21 +
11 files changed, 718 insertions(+), 20 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java b/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java
index 9f1a364..a44a11f 100644
--- a/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java
+++ b/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java
@@ -6,6 +6,8 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.dao.business.dto.ApplyChangeOptDTO;
+import com.doumee.dao.business.dto.InsuranceApplyOptDTO;
import com.doumee.dao.business.model.ApplyChange;
import com.doumee.service.business.ApplyChangeService;
import io.swagger.annotations.Api;
@@ -71,7 +73,7 @@
@PostMapping("/page")
@RequiresPermissions("business:applychange:query")
public ApiResponse<PageData<ApplyChange>> findPage (@RequestBody PageWrap<ApplyChange> pageWrap) {
- return ApiResponse.success(applyChangeService.findPage(pageWrap));
+ return ApiResponse.success(applyChangeService.findPageForCompany(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@@ -85,6 +87,16 @@
@GetMapping("/{id}")
@RequiresPermissions("business:applychange:query")
public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(applyChangeService.findById(id));
+ return ApiResponse.success(applyChangeService.findDetail(id));
}
+
+
+ @ApiOperation(value = "涓氬姟澶勭悊",notes = "閫�鍥炵敵璇凤紝鍏抽棴绛�")
+ @PostMapping("/applyChangeOpt")
+ public ApiResponse applyChangeOpt (@RequestBody ApplyChangeOptDTO applyChangeOptDTO) {
+ applyChangeService.changeOpt(applyChangeOptDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
}
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 84598f6..d25517c 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -1,5 +1,8 @@
package com.doumee.core.utils;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.dao.business.model.Solutions;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -7,6 +10,7 @@
import java.math.BigDecimal;
import java.net.URLDecoder;
import java.util.*;
+import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -705,8 +709,110 @@
}
+ public static BigDecimal countDetailFee(Solutions solutions,Date startDate, Date endDate){
+ //鏌ヨ淇濋櫓瀹為檯鍛ㄦ湡
+ Integer cycle = DateUtil.calculateBetween(endDate,startDate,solutions.getDataType());
+ if(cycle==-1){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏃ユ湡淇℃伅閿欒!");
+ }
+ return solutions.getPrice().multiply(new BigDecimal(cycle));
+ }
+ public enum ApplyChangeStatus {
+ UPLOAD(0, "鎻愪氦鍔犲噺淇�/鎹㈠巶鐢宠"),
+ SIGNATURE(1, "宸茬绔�"),
+ APPROVE(2, "宸蹭笂浼犲鎵�"),
+ RETURN_APPLY(3, "鍙戣捣閫�鍥炵敵璇�"),
+ PLATFORM_AGREE(4, "骞冲彴鍚屾剰锛堝凡閫�鍥烇級"),
+ CLOSE(5, "宸插叧闂�"),
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private int key;
+
+ // 鏋勯�犳柟娉�
+ ApplyChangeStatus(int key, String name) {
+ this.name = name;
+ this.key = key;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (ApplyLogType c : ApplyLogType.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+
+ // get set 鏂规硶
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ }
+
+//3=閫�鍥炵敵璇凤紱4=骞冲彴瀹℃壒閫氳繃锛�0=瀹℃壒椹冲洖;5=骞冲彴瀹℃壒椹冲洖
+ public enum ApplyChangeLogStatus {
+ UPLOAD(0, "鍙戣捣鐢宠"),
+ RETURN_APPLY(3, "鍙戣捣閫�鍥炵敵璇�"),
+ PLATFORM_AGREE(4, "骞冲彴瀹℃壒閫氳繃"),
+ PLATFORM_UN_AGREE(0, "瀹℃壒椹冲洖"),
+ CLOSE(5, "鍏抽棴"),
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private int key;
+
+ // 鏋勯�犳柟娉�
+ ApplyChangeLogStatus(int key, String name) {
+ this.name = name;
+ this.key = key;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (ApplyLogType c : ApplyLogType.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+
+ // get set 鏂规硶
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ }
+
public enum ProjectRecord {
COM_EDITING(0, "浼佷笟淇濆瓨鏁版嵁", "鐢� ${param2} ${param3}淇濆瓨鎴愬姛锛屽綋鍓嶈繘搴︿负 銆�${param4}銆�"),
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/ApplyChangeOptDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/ApplyChangeOptDTO.java
new file mode 100644
index 0000000..64715e3
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/ApplyChangeOptDTO.java
@@ -0,0 +1,21 @@
+package com.doumee.dao.business.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author RenKang
+ */
+@Data
+public class ApplyChangeOptDTO {
+
+ @ApiModelProperty(value = "鍗曟嵁涓婚敭", example = "1")
+ private Integer applyId;
+
+ @ApiModelProperty(value = "鎿嶄綔璇存槑")
+ private String optIllustration;
+
+ @ApiModelProperty(value = "鎿嶄綔绫诲瀷锛�3=閫�鍥炵敵璇凤紱4=骞冲彴瀹℃壒閫氳繃锛�0=瀹℃壒椹冲洖;5=鍏抽棴")
+ private Integer optType;
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/join/ApplyChagneDetailJoinMapper.java b/server/service/src/main/java/com/doumee/dao/business/join/ApplyChagneDetailJoinMapper.java
new file mode 100644
index 0000000..c2e9ec8
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/join/ApplyChagneDetailJoinMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business.join;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.ApplyChagneDetail;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2024/01/16 10:03
+ */
+public interface ApplyChagneDetailJoinMapper extends MPJJoinMapper<ApplyChagneDetail> {
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/join/ApplyChangeJoinMapper.java b/server/service/src/main/java/com/doumee/dao/business/join/ApplyChangeJoinMapper.java
new file mode 100644
index 0000000..bea7a96
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/join/ApplyChangeJoinMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business.join;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.ApplyChange;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2024/01/16 10:03
+ */
+public interface ApplyChangeJoinMapper extends MPJJoinMapper<ApplyChange> {
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
index 8965f23..ada6639 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
@@ -75,7 +75,6 @@
@ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
@ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
-
private Date idcardNo;
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)")
@@ -94,6 +93,14 @@
@ExcelColumn(name="绫诲瀷 0鍔� 1鍑� 2鎹㈠巶")
private Integer type;
+ @ApiModelProperty(value = "鍘熸淳閬ｅ崟浣嶇紪鐮侊紙鍏宠仈dispatch_unit)")
+ @ExcelColumn(name="鍘熸淳閬ｅ崟浣嶇紪鐮侊紙鍏宠仈dispatch_unit)")
+ private String oldDuId;
+
+ @ApiModelProperty(value = "鍘熷伐绉嶇紪鐮�", example = "1")
+ @ExcelColumn(name="鍘熷伐绉嶇紪鐮�")
+ private Integer oldWorktypeId;
+
@ApiModelProperty(value = "鍛樺伐鍚嶇О")
@TableField(exist = false)
private String memberName;
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
index 5182170..5d45a24 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +9,10 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* 鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃
@@ -31,7 +35,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
-
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -68,13 +71,12 @@
private Date applyStartTime;
- @ApiModelProperty(value = "鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇�")
- @ExcelColumn(name="鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇�")
- private String status;
+ @ApiModelProperty(value = "鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� 4骞冲彴鍚屾剰 5骞冲彴椹冲洖")
+ @ExcelColumn(name="鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� 4骞冲彴鍚屾剰 5骞冲彴椹冲洖")
+ private Integer status;
@ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
-
private Date validTime;
@ApiModelProperty(value = "鎵瑰崟鍙�")
@@ -85,4 +87,63 @@
@ExcelColumn(name="鎿嶄綔绫诲瀷 0鍔犲噺淇� 1鎹㈠巶")
private Integer type;
+ @ApiModelProperty(value = "淇濆崟鍙�")
+ @TableField(exist = false)
+ private String applyCode;
+
+ @ApiModelProperty(value = "浼佷笟鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+
+
+ @ApiModelProperty(value = "鏂规鍚嶇О")
+ @TableField(exist = false)
+ private String solutionsName;
+
+
+ @ApiModelProperty(value = "鍔犱繚浜烘暟")
+ @TableField(exist = false)
+ private Integer addNum;
+
+ @ApiModelProperty(value = "鍙樻洿閲戦")
+ @TableField(exist = false)
+ private BigDecimal changeMoney;
+
+ @ApiModelProperty(value = "鍑忎繚浜烘暟")
+ @TableField(exist = false)
+ private Integer delNum;
+
+ @ApiModelProperty(value = "鎹㈠巶浜烘暟")
+ @TableField(exist = false)
+ private Integer changeNum;
+
+ @ApiModelProperty(value = "鎻愪氦鏃ユ湡寮�濮� yyyy-MM-dd ")
+ @TableField(exist = false)
+ private String createDateS;
+
+ @ApiModelProperty(value = "鎻愪氦鏃ユ湡缁撴潫 yyyy-MM-dd ")
+ @TableField(exist = false)
+ private String createDateE;
+
+ @ApiModelProperty(value = "淇濋櫓鏂规涓婚敭")
+ @TableField(exist = false)
+ private Integer solutionsId;
+
+ @ApiModelProperty(value = "鍔犱繚鏄庣粏鏁版嵁")
+ @TableField(exist = false)
+ private List<ApplyChagneDetail> addDetailList;
+
+ @ApiModelProperty(value = "鍑忎繚鏄庣粏鏁版嵁")
+ @TableField(exist = false)
+ private List<ApplyChagneDetail> delDetailList;
+
+ @ApiModelProperty(value = "鎹㈠巶鏄庣粏鏁版嵁")
+ @TableField(exist = false)
+ private List<ApplyChagneDetail> changeDetailList;
+
+
+ @ApiModelProperty(value = "浼佷笟涓婚敭")
+ @TableField(exist = false)
+ private Integer companyId;
+
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index d400814..65ab2a4 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -132,6 +132,10 @@
@TableField(exist = false)
private Integer insureNum;
+ @ApiModelProperty(value = "鏈嶅姟澶╂暟")
+ @TableField(exist = false)
+ private Integer serviceDays;
+
@ApiModelProperty(value = "鏃ュ織璁板綍")
@TableField(exist = false)
private List<ApplyLog> applyLogList;
diff --git a/server/service/src/main/java/com/doumee/service/business/ApplyChangeService.java b/server/service/src/main/java/com/doumee/service/business/ApplyChangeService.java
index 6e4c3c9..46a2f77 100644
--- a/server/service/src/main/java/com/doumee/service/business/ApplyChangeService.java
+++ b/server/service/src/main/java/com/doumee/service/business/ApplyChangeService.java
@@ -2,6 +2,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dto.ApplyChangeOptDTO;
import com.doumee.dao.business.model.ApplyChange;
import java.util.List;
@@ -87,6 +88,9 @@
*/
PageData<ApplyChange> findPage(PageWrap<ApplyChange> pageWrap);
+ PageData<ApplyChange> findPageForCompany(PageWrap<ApplyChange> pageWrap);
+
+
/**
* 鏉′欢缁熻
*
@@ -94,4 +98,8 @@
* @return long
*/
long count(ApplyChange applyChange);
+
+ void changeOpt(ApplyChangeOptDTO applyChangeOptDTO);
+
+ ApplyChange findDetail(Integer id);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index 6f89ba9..3b6ae79 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -1,20 +1,39 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.ApplyChangeMapper;
-import com.doumee.dao.business.model.ApplyChange;
+import com.doumee.dao.business.*;
+import com.doumee.dao.business.dto.ApplyChangeOptDTO;
+import com.doumee.dao.business.dto.InsuranceApplyOptDTO;
+import com.doumee.dao.business.join.ApplyChagneDetailJoinMapper;
+import com.doumee.dao.business.join.ApplyChangeJoinMapper;
+import com.doumee.dao.business.join.ApplyDetailJoinMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.ApplyChangeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
+import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃Service瀹炵幇
@@ -27,10 +46,303 @@
@Autowired
private ApplyChangeMapper applyChangeMapper;
+ @Autowired
+ private InsuranceApplyMapper insuranceApplyMapper;
+
+ @Autowired
+ private ApplyChangeJoinMapper applyChangeJoinMapper;
+
+ @Autowired
+ private ApplyChagneDetailJoinMapper applyChagneDetailJoinMapper;
+
+ @Autowired
+ private ApplyDetailJoinMapper applyDetailJoinMapper;
+
+ @Autowired
+ private MemberMapper memberMapper;
+
+ @Autowired
+ private DuSolutionMapper duSolutionMapper;
+ @Autowired
+ private DuWorktypeMapper duWorktypeMapper;
+
+ @Autowired
+ private ApplyLogMapper applyLogMapper;
+
+ @Autowired
+ private SolutionsMapper solutionsMapper;
+
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer create(ApplyChange applyChange) {
+ if (Objects.isNull(applyChange)
+ || Objects.isNull(applyChange.getApplyId())
+ || Objects.isNull(applyChange.getValidTime())
+ || Objects.isNull(applyChange.getType())
+ || !(applyChange.getType().equals(Constants.ZERO) || applyChange.getType().equals(Constants.TWO))
+ ) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if (!loginUserInfo.getType().equals(Constants.ONE)) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+ }
+ InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyChange.getApplyId());
+ if (Objects.isNull(insuranceApply)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if (insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())) {
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "淇濆崟鐘舵�侀敊璇�");
+ }
+ if (DateUtil.compareDate(new Date(), insuranceApply.getEndTime()) >= Constants.ZERO
+ ) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "淇濆崟宸茶繃淇濓紝鏃犳硶杩涜璇ユ搷浣�");
+ }
+ Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
+ }
+ //鐢宠鏃堕棿蹇呴』澶勪簬淇濆崟鐨勬椂闂磋寖鍥村唴
+ if (!(DateUtil.compareDate(applyChange.getValidTime(), insuranceApply.getStartTime()) >= Constants.ZERO
+ && DateUtil.compareDate(insuranceApply.getEndTime(), applyChange.getValidTime()) >= Constants.ZERO)) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢宠鏃ユ湡鏈浜庝繚鍗曟棩鏈熷唴锛屾棤娉曡繘琛岃鎿嶄綔");
+ }
+ applyChange.setCreateDate(new Date());
+ applyChange.setCreator(loginUserInfo.getId());
+ applyChange.setIsdeleted(Constants.ZERO);
+ applyChange.setStatus(Constants.ZERO);
applyChangeMapper.insert(applyChange);
+
+
+ List<DuSolution> duSolutionList = duSolutionMapper.selectList(new QueryWrapper<DuSolution>().lambda()
+ .eq(DuSolution::getIsdeleted, Constants.ZERO)
+ .eq(DuSolution::getStatus, Constants.ONE)
+ .eq(DuSolution::getSolutionId, insuranceApply.getSolutionId()));
+ if (!CollectionUtils.isNotEmpty(duSolutionList)) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌娲鹃仯鍗曚綅");
+ }
+
+ //鏌ヨ鎵�鏈夋淳閬ｅ崟浣嶄笅鐨勫伐绉�
+ List<Integer> duSolutionIdList = duSolutionList.stream().map(i -> i.getId()).collect(Collectors.toList());
+ List<DuWorktype> duWorktypeList = duWorktypeMapper.selectList(new QueryWrapper<DuWorktype>().lambda()
+ .eq(DuWorktype::getIsdeleted, Constants.ZERO)
+ .eq(DuWorktype::getStatus, Constants.ONE)
+ .in(DuWorktype::getDuSolutionId, duSolutionIdList));
+ if (!CollectionUtils.isNotEmpty(duWorktypeList)) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌宸ョ淇℃伅");
+ }
+ //鍔犱繚鏁版嵁
+ List<ApplyChagneDetail> addDetailList = applyChange.getAddDetailList();
+ if (CollectionUtils.isNotEmpty(addDetailList)) {
+ this.addChangeDetail(applyChange,addDetailList,duWorktypeList,duSolutionList,insuranceApply,solutions,loginUserInfo);
+ }
+
+ //鍑忎繚鏁版嵁
+ List<ApplyChagneDetail> delDetailList = applyChange.getDelDetailList();
+ if (CollectionUtils.isNotEmpty(delDetailList)) {
+ this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo);
+ }
+ //鎹㈠巶涓氬姟
+ List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
+ if (CollectionUtils.isNotEmpty(changeDetailList)) {
+ this.changeDetail(applyChange,changeDetailList,duWorktypeList,duSolutionList,loginUserInfo);
+ }
+
+ this.saveApplyLog(applyChange,Constants.ApplyChangeLogStatus.UPLOAD,null);
+
+
return applyChange.getId();
+ }
+
+
+ public void saveApplyLog(ApplyChange applyChange,Constants.ApplyChangeLogStatus applyChangeLogStatus,String content){
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ ApplyLog applyLog = new ApplyLog();
+ applyLog.setCreateDate(new Date());
+ applyLog.setCreator(loginUserInfo.getId());
+ applyLog.setIsdeleted(Constants.ZERO);
+ applyLog.setApplyId(applyChange.getApplyId());
+ applyLog.setTitle(applyChangeLogStatus.getName());
+ applyLog.setContent(content);
+ applyLog.setObjType(applyChangeLogStatus.getKey());
+ applyLog.setObjId(Integer.toString(applyChange.getId()));
+ applyLog.setStatus(applyChange.getStatus());
+ applyLogMapper.insert(applyLog);
+ }
+
+
+ /**
+ * 鍑忎繚鏁版嵁澶勭悊
+ * @param applyChange
+ * @param delDetailList
+ * @param loginUserInfo
+ */
+ public void delChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> delDetailList,InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo){
+ for (ApplyChagneDetail applyChagneDetail : delDetailList) {
+ if (Objects.isNull(applyChagneDetail.getMemberId())) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
+ }
+ Member member = memberMapper.selectById(applyChagneDetail.getMemberId());
+ if (Objects.isNull(member)) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮郴缁熶汉鍛樹俊鎭�");
+ }
+ //鏌ヨ鍛樺伐鏄惁瀛樺湪 0寰呯缃� 1宸茬绔� 鐨勬绫讳笟鍔′繚鏁版嵁 鍚屼竴涓诲崟涓�
+ if (applyChagneDetailJoinMapper.selectJoinCount(
+ new MPJLambdaWrapper<ApplyChagneDetail>()
+ .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+ .eq(ApplyChagneDetail::getMemberId, applyChagneDetail.getMemberId())
+ .in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE)
+ ) > Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄧ敵璇蜂腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁");
+ }
+ //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
+ List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
+ .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
+ .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
+ .le(ApplyDetail::getStartTime, "now()")
+ .ge(ApplyDetail::getEndTime, "now()"));
+ if (applyDetailList.size() > Constants.ONE) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚俊鎭紓甯革紝瀛樺湪澶氭潯鏁版嵁");
+ }
+ ApplyDetail applyDetail = applyDetailList.get(Constants.ZERO);
+ if (applyChange.getValidTime().compareTo(DateUtil.StringToDate(applyDetail.getEndTime())) <= 0) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚繚闅滄棩鏈熻嚦锛氥��" + applyDetail.getEndTime() + "銆戞棤娉曢�氳繃鏈鐢宠");
+ }
+ applyChagneDetail.setCreateDate(new Date());
+ applyChagneDetail.setCreator(loginUserInfo.getId());
+ applyChagneDetail.setIsdeleted(Constants.ZERO);
+ applyChagneDetail.setApplyChangeId(applyChange.getId());
+ applyChagneDetail.setType(Constants.ONE);
+ applyChagneDetail.setFee(
+ Constants.countDetailFee(solutions,DateUtil.stringToDate(applyDetail.getEndTime(),"yyyy-MM-dd HH:mm:ss"),DateUtil.stringToDate(applyDetail.getStartTime(),"yyyy-MM-dd HH:mm:ss"))
+ .subtract(Constants.countDetailFee(solutions,applyChange.getValidTime(),DateUtil.stringToDate(applyDetail.getStartTime(),"yyyy-MM-dd HH:mm:ss")))
+ );
+ applyChagneDetailJoinMapper.insert(applyChagneDetail);
+ }
+ }
+
+
+
+ /**
+ * 鍔犱繚鏁版嵁澶勭悊
+ * @param applyChange
+ * @param addDetailList
+ * @param duWorktypeList
+ * @param duSolutionList
+ * @param loginUserInfo
+ */
+ public void addChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> addDetailList,List<DuWorktype> duWorktypeList,List<DuSolution> duSolutionList,InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo){
+ for (ApplyChagneDetail applyChagneDetail : addDetailList) {
+ if (Objects.isNull(applyChagneDetail.getMemberId())
+ || Objects.isNull(applyChagneDetail.getDuId())
+ || Objects.isNull(applyChagneDetail.getWorktypeId())
+ ) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
+ }
+ Member member = memberMapper.selectById(applyChagneDetail.getMemberId());
+ if (Objects.isNull(member)) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮郴缁熶汉鍛樹俊鎭�");
+ }
+ //鏌ヨ鍛樺伐鏄惁瀛樺湪 0寰呯缃� 1宸茬绔� 鐨勬绫讳笟鍔′繚鏁版嵁 鍚屼竴涓诲崟涓�
+ if (applyChagneDetailJoinMapper.selectJoinCount(
+ new MPJLambdaWrapper<ApplyChagneDetail>()
+ .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+ .eq(ApplyChagneDetail::getMemberId, applyChagneDetail.getMemberId())
+ .in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE)
+ ) > Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄧ敵璇蜂腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁");
+ }
+ //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
+ if (applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>().lambda()
+ .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
+ .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
+ .le(ApplyDetail::getStartTime, "now()")
+ .ge(ApplyDetail::getEndTime, "now()")
+ ) > Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄤ繚闅滀腑鐨勪繚鍗曚俊鎭紝鏃犳硶杩涜鍔犱繚");
+ }
+
+ //楠岃瘉娲鹃仯鍗曚綅淇℃伅 涓庡伐绉嶄俊鎭� 鏄惁瀛樺湪
+ if (duSolutionList.stream().filter(d -> d.getDispatchUnitId().equals(applyChagneDetail.getDuId())).collect(Collectors.toList()).size() <= Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+ }
+ if (duWorktypeList.stream().filter(d -> d.getDuSolutionId().equals(applyChagneDetail.getDuId()) && d.getWorkTypeId().equals(applyChagneDetail.getWorktypeId()))
+ .collect(Collectors.toList()).size() <= Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
+ }
+ applyChagneDetail.setCreateDate(new Date());
+ applyChagneDetail.setCreator(loginUserInfo.getId());
+ applyChagneDetail.setIsdeleted(Constants.ZERO);
+ applyChagneDetail.setApplyChangeId(applyChange.getId());
+ applyChagneDetail.setType(Constants.ZERO);
+ applyChagneDetail.setFee(
+
+ Constants.countDetailFee(solutions,insuranceApply.getEndTime(),applyChange.getValidTime())
+ );
+ applyChagneDetailJoinMapper.insert(applyChagneDetail);
+ }
+ }
+
+
+ /**
+ * 鎹㈠巶涓氬姟
+ * @param applyChange
+ * @param duWorktypeList
+ * @param duSolutionList
+ * @param changeDetailList
+ * @param loginUserInfo
+ */
+ public void changeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> changeDetailList,List<DuWorktype> duWorktypeList,List<DuSolution> duSolutionList,LoginUserInfo loginUserInfo){
+ for (ApplyChagneDetail applyChagneDetail : changeDetailList) {
+ if (Objects.isNull(applyChagneDetail.getMemberId())
+ || Objects.isNull(applyChagneDetail.getOldDuId())
+ || Objects.isNull(applyChagneDetail.getOldWorktypeId())
+ || Objects.isNull(applyChagneDetail.getDuId())
+ || Objects.isNull(applyChagneDetail.getWorktypeId())
+ ) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
+ }
+ Member member = memberMapper.selectById(applyChagneDetail.getMemberId());
+ if (Objects.isNull(member)) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮郴缁熶汉鍛樹俊鎭�");
+ }
+ //鏌ヨ鍛樺伐鏄惁瀛樺湪 0寰呯缃� 1宸茬绔� 鐨勬绫讳笟鍔′繚鏁版嵁 鍚屼竴涓诲崟涓�
+ if (applyChagneDetailJoinMapper.selectJoinCount(
+ new MPJLambdaWrapper<ApplyChagneDetail>()
+ .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+ .eq(ApplyChagneDetail::getMemberId, applyChagneDetail.getMemberId())
+ .in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE)
+ ) > Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄧ敵璇蜂腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁");
+ }
+ //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
+ List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
+ .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
+ .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
+ .le(ApplyDetail::getStartTime, "now()")
+ .ge(ApplyDetail::getEndTime, "now()"));
+ if(applyDetailList.size()>Constants.ONE){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚俊鎭紓甯革紝瀛樺湪澶氭潯鏁版嵁");
+ }
+ ApplyDetail applyDetail = applyDetailList.get(Constants.ZERO);
+ if(applyChange.getValidTime().compareTo(DateUtil.StringToDate(applyDetail.getEndTime()))<=0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚繚闅滄棩鏈熻嚦锛氥��"+applyDetail.getEndTime()+"銆戞棤娉曢�氳繃鏈鐢宠");
+ }
+ //楠岃瘉娲鹃仯鍗曚綅淇℃伅 涓庡伐绉嶄俊鎭� 鏄惁瀛樺湪
+ if (duSolutionList.stream().filter(d -> d.getDispatchUnitId().equals(applyChagneDetail.getDuId())).collect(Collectors.toList()).size() <= Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+ }
+ if (duWorktypeList.stream().filter(d -> d.getDuSolutionId().equals(applyChagneDetail.getDuId()) && d.getWorkTypeId().equals(applyChagneDetail.getWorktypeId()))
+ .collect(Collectors.toList()).size() <= Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
+ }
+ applyChagneDetail.setCreateDate(new Date());
+ applyChagneDetail.setCreator(loginUserInfo.getId());
+ applyChagneDetail.setIsdeleted(Constants.ZERO);
+ applyChagneDetail.setApplyChangeId(applyChange.getId());
+ applyChagneDetail.setType(Constants.TWO);
+ applyChagneDetailJoinMapper.insert(applyChagneDetail);
+ }
}
@Override
@@ -153,4 +465,130 @@
QueryWrapper<ApplyChange> wrapper = new QueryWrapper<>(applyChange);
return applyChangeMapper.selectCount(wrapper);
}
+
+
+
+ @Override
+ public PageData<ApplyChange> findPageForCompany(PageWrap<ApplyChange> pageWrap) {
+ IPage<ApplyChange> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<ApplyChange> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ ApplyChange model = pageWrap.getModel() ;
+ queryWrapper
+ .selectAll(ApplyChange.class)
+ .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
+ .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0 )",ApplyChange::getAddNum)
+ .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1 )",ApplyChange::getDelNum)
+ .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2 )",ApplyChange::getChangeNum)
+ .select("( select ifnull(sum(ad.FEE),0) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID )",ApplyChange::getChangeMoney)
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+ .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+ .eq(!Objects.isNull(model.getType()),ApplyChange::getType,model.getType())
+ .eq(!Objects.isNull(model.getStatus()),ApplyChange::getStatus,model.getStatus())
+ .eq(!Objects.isNull(model.getCompanyId()),InsuranceApply::getCompanyId,model.getCompanyId())
+ .eq(!Objects.isNull(model.getSolutionsId()),ApplyChange::getSolutionsId,model.getSolutionsId())
+ .ge(StringUtils.isNotBlank(model.getCreateDateS()),ApplyChange::getCreateDate, model.getCreateDateS()+" 00:00:00" )
+ .le(StringUtils.isNotBlank(model.getCreateDateE()),ApplyChange::getCreateDate, model.getCreateDateE()+" 23:59:59" );
+
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ PageData<ApplyChange> pageData = PageData.from(applyChangeJoinMapper.selectJoinPage(page,ApplyChange.class, queryWrapper));
+ return pageData;
+ }
+
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void changeOpt(ApplyChangeOptDTO applyChangeOptDTO){
+ if(Objects.isNull(applyChangeOptDTO)
+ ||Objects.isNull(applyChangeOptDTO.getApplyId())
+ ||StringUtils.isBlank(applyChangeOptDTO.getOptIllustration())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ ApplyChange applyChange = applyChangeMapper.selectById(applyChangeOptDTO.getApplyId());
+ if(Objects.isNull(applyChange)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍗曟嵁鏁版嵁");
+ }
+ InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyChange.getApplyId());
+ if(Objects.isNull(insuranceApply)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濆崟鏁版嵁");
+ }
+ if(applyChange.getIsdeleted().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鏁版嵁宸插垹闄�,鏃犳硶杩涜璇ユ搷浣�");
+ }
+ Constants.ApplyChangeLogStatus applyChangeLogStatus = Constants.ApplyChangeLogStatus.RETURN_APPLY;
+
+ if(applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.RETURN_APPLY.getKey())){
+ //鍙戣捣閫�鍥炵敵璇�
+ if(loginUserInfo.getType().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(!applyChange.getStatus().equals(Constants.ApplyChangeStatus.UPLOAD.getKey()) ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
+ }
+ }else if(applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())){
+ applyChangeLogStatus = Constants.ApplyChangeLogStatus.PLATFORM_AGREE;
+ //骞冲彴鍚屾剰閫�鍥�
+ if(loginUserInfo.getType().equals(Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲钩鍙扮鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(!applyChange.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
+ }
+ }else if(applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.UPLOAD.getKey())){
+ applyChangeLogStatus = Constants.ApplyChangeLogStatus.PLATFORM_UN_AGREE;
+ //骞冲彴椹冲洖閫�鍥�
+ if(loginUserInfo.getType().equals(Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲钩鍙扮鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(!applyChange.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
+ }
+ }else if(applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.CLOSE.getKey())){
+ applyChangeLogStatus = Constants.ApplyChangeLogStatus.CLOSE;
+ //浼佷笟鍏抽棴
+ if(loginUserInfo.getType().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(!applyChange.getStatus().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
+ }
+ }else{
+ throw new BusinessException(ResponseStatus.BAD_REQUEST );
+ }
+ applyChange.setStatus(applyChangeOptDTO.getOptType());
+ applyChangeMapper.updateById(applyChange);
+// //瀛樺偍鏃ュ織鏁版嵁
+ this.saveApplyLog(applyChange,applyChangeLogStatus,applyChangeOptDTO.getOptIllustration());
+ }
+
+
+ @Override
+ public ApplyChange findDetail(Integer id){
+ MPJLambdaWrapper<ApplyChange> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(ApplyChange.class)
+ .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
+ .selectAs(Company::getName,ApplyChange::getCompanyName)
+ .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0 )",ApplyChange::getAddNum)
+ .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1 )",ApplyChange::getDelNum)
+ .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2 )",ApplyChange::getChangeNum)
+ .select("( select ifnull(sum(ad.FEE),0) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID )",ApplyChange::getChangeMoney)
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+ .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+ .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+ .eq(ApplyChange::getId,id);
+ ApplyChange applyChange = applyChangeJoinMapper.selectOne(queryWrapper);
+ return applyChange;
+ }
+
+
+
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index 8940095..3dbe7b2 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -143,7 +143,7 @@
}
applyDetail.setIdcardNo(member.getIdcardNo());
applyDetail.setSex(member.getSex());
- applyDetail.setFee(this.countDetailFee(solutions,insuranceApply.getApplyEndTime(),insuranceApply.getApplyStartTime()));
+ applyDetail.setFee(Constants.countDetailFee(solutions,insuranceApply.getApplyEndTime(),insuranceApply.getApplyStartTime()));
//楠岃瘉娲鹃仯鍗曚綅淇℃伅鏄惁瀛樺湪
if(duSolutionList.stream().filter(d->d.getDispatchUnitId().equals(applyDetail.getDuId())).collect(Collectors.toList()).size()<=Constants.ZERO){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
@@ -176,14 +176,14 @@
- public BigDecimal countDetailFee(Solutions solutions ,Date startDate,Date endDate){
- //鏌ヨ淇濋櫓瀹為檯鍛ㄦ湡
- Integer cycle = DateUtil.calculateBetween(endDate,startDate,solutions.getDataType());
- if(cycle==-1){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏃ユ湡淇℃伅閿欒!");
- }
- return solutions.getPrice().multiply(new BigDecimal(cycle));
- }
+// public BigDecimal countDetailFee(Solutions solutions ,Date startDate,Date endDate){
+// //鏌ヨ淇濋櫓瀹為檯鍛ㄦ湡
+// Integer cycle = DateUtil.calculateBetween(endDate,startDate,solutions.getDataType());
+// if(cycle==-1){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏃ユ湡淇℃伅閿欒!");
+// }
+// return solutions.getPrice().multiply(new BigDecimal(cycle));
+// }
// public static void main(String[] args) {
// Date date1 = DateUtil.StringToDate("2023-03-01 00:00:00");
@@ -319,6 +319,21 @@
insuranceApply.setInsureNum(applyDetailMapper.selectCount(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getApplyId,insuranceApply.getId())
.eq(ApplyDetail::getIsdeleted,Constants.ZERO)));
+ //璁剧疆鍦ㄤ繚鏃堕暱锛堝ぉ鏁帮級
+ if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
+ //濡傛灉褰撳墠鏃堕棿澶т簬缁撴潫鏃ユ湡 鍒欎娇鐢ㄧ粨鏉熸棩鏈熷姣斿紑濮嬫棩鏈�
+ if(DateUtil.compareDate(new Date(),insuranceApply.getEndTime())>=Constants.ZERO){
+ insuranceApply.setServiceDays(DateUtil.daysBetweenDates(insuranceApply.getEndTime(),insuranceApply.getStartTime()));
+ }else if(DateUtil.compareDate(insuranceApply.getStartTime(),new Date())>=Constants.ZERO){
+ //鏈紑濮�
+ insuranceApply.setServiceDays(Constants.ZERO);
+ }else{
+ insuranceApply.setServiceDays(DateUtil.daysBetweenDates(new Date(),insuranceApply.getStartTime()));
+ }
+ }
+
+
+
//鏌ヨ鎿嶄綔璁板綍
List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
new MPJLambdaWrapper<ApplyLog>()
--
Gitblit v1.9.3