From 771bf130c7fc34fd710045591080378b54a7e16b Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 19 一月 2024 09:27:31 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/core/utils/DateUtil.java | 53 +++++++
server/platform/src/main/java/com/doumee/api/business/DispatchUnitController.java | 5
server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java | 4
server/service/src/main/java/com/doumee/service/business/impl/TaxDetialServiceImpl.java | 6
server/service/src/main/java/com/doumee/dao/business/model/Member.java | 7
server/service/src/main/java/com/doumee/core/utils/Constants.java | 107 +++++++++++++++
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 148 +++++++++++++++++++-
server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java | 2
server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java | 15 ++
server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java | 6
server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java | 15 +
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 4
12 files changed, 332 insertions(+), 40 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/DispatchUnitController.java b/server/platform/src/main/java/com/doumee/api/business/DispatchUnitController.java
index 993c1e1..a640db4 100644
--- a/server/platform/src/main/java/com/doumee/api/business/DispatchUnitController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/DispatchUnitController.java
@@ -6,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.dao.business.dto.SaveDispatchUnitDTO;
import com.doumee.dao.business.model.DispatchUnit;
import com.doumee.service.business.DispatchUnitService;
import io.swagger.annotations.Api;
@@ -34,8 +35,8 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@RequiresPermissions("business:dispatchunit:create")
- public ApiResponse create(@RequestBody DispatchUnit dispatchUnit) {
- return ApiResponse.success(dispatchUnitService.create(dispatchUnit));
+ public ApiResponse create(@RequestBody SaveDispatchUnitDTO saveDispatchUnitDTO) {
+ return ApiResponse.success(dispatchUnitService.create(saveDispatchUnitDTO));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
diff --git a/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java b/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java
index c496a01..3b79d89 100644
--- a/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.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.InsuranceApplyQueryDTO;
+import com.doumee.dao.business.dto.SaveDispatchUnitDTO;
import com.doumee.dao.business.model.InsuranceApply;
import com.doumee.service.business.InsuranceApplyService;
import io.swagger.annotations.Api;
@@ -70,14 +72,14 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:insuranceapply:query")
- public ApiResponse<PageData<InsuranceApply>> findPage (@RequestBody PageWrap<InsuranceApply> pageWrap) {
+ public ApiResponse<PageData<InsuranceApply>> findPage (@RequestBody PageWrap<InsuranceApplyQueryDTO> pageWrap) {
return ApiResponse.success(insuranceApplyService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:insuranceapply:exportExcel")
- public void exportExcel (@RequestBody PageWrap<InsuranceApply> pageWrap, HttpServletResponse response) {
+ public void exportExcel (@RequestBody PageWrap<InsuranceApplyQueryDTO> pageWrap, HttpServletResponse response) {
ExcelExporter.build(InsuranceApply.class).export(insuranceApplyService.findPage(pageWrap).getRecords(), "鎶曚繚鐢宠淇℃伅琛�", response);
}
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 b4cae7f..b8bf63d 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
@@ -556,14 +556,13 @@
public enum DispatchUnitLogType {
-
UPLOAD(0, "鎻愪氦鐢宠"),
AUDIT_PASS(1, "娲鹃仯鍗曚綅閫氳繃"),
AUDIT_UN_PASS(2, "娲鹃仯鍗曚綅涓嶉�氳繃"),
EDIT_UNIT(3, "淇敼娲鹃仯鍗曚綅淇℃伅"),
ADD_WORK_TYPE(4, "鎻愪氦娣诲姞宸ョ"),
WORK_TYPE_AUDIT_PASS(5, "娣诲姞宸ョ瀹℃壒閫氳繃"),
- WORK_TYPE_AUDIT_UN_PASS(5, "娣诲姞宸ョ瀹℃壒涓嶉�氳繃"),
+ WORK_TYPE_AUDIT_UN_PASS(6, "娣诲姞宸ョ瀹℃壒涓嶉�氳繃"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -604,6 +603,110 @@
}
+
+ public enum ApplyLogType {
+ UPLOAD(0, "鎻愪氦鎶曚繚鐢宠"),
+ PLATFORM_RETURN(1, "骞冲彴閫�鍥炰繚鍗�"),
+ WAIT_SIGNATURE(2, "宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔�"),
+ SIGNATURE(3, "宸茬绔犲緟涓婁紶淇濋櫓鍗�"),
+ FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�"),
+ UPLOAD_INSURANCE(5, "宸蹭笂浼犱繚鍗�"),
+ COMPANY_APPLY_RETURN(6, "浼佷笟鐢宠閫�鍥�"),
+ COMPANY_APPLY_CLOSE(7, "浼佷笟鍏抽棴鐢宠"),
+ PLATFORM_AGREE(8, "骞冲彴鍚屾剰浼佷笟閫�鍥炵敵璇�"),
+ PLATFORM_UN_AGREE(9, "骞冲彴鎷掔粷浼佷笟閫�鍥炵敵璇�"),
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private int key;
+
+ // 鏋勯�犳柟娉�
+ ApplyLogType(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 InsuranceApplyStatus {
+ UPLOAD(0, "鎻愪氦鎶曚繚鐢宠"),
+ PLATFORM_RETURN(1, "骞冲彴閫�鍥炰繚鍗�"),
+ WAIT_SIGNATURE(2, "宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔�"),
+ SIGNATURE(3, "宸茬绔犲緟涓婁紶淇濋櫓鍗�"),
+ FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�"),
+ UPLOAD_INSURANCE(5, "宸蹭笂浼犱繚鍗�"),
+ COMPANY_APPLY_RETURN(6, "浼佷笟鐢宠閫�鍥�"),
+ COMPANY_APPLY_CLOSE(7, "浼佷笟鍏抽棴鐢宠"),
+ CLOSE(8, "璁㈠崟鍏抽棴"),
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private int key;
+
+ // 鏋勯�犳柟娉�
+ InsuranceApplyStatus(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/core/utils/DateUtil.java b/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
index 7942d79..0c1a728 100644
--- a/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -1292,6 +1292,52 @@
return days;
}
+ public static int calculateBetween(Date newDate, Date oldDate,Integer type){
+ Calendar calo = Calendar.getInstance();
+ Calendar caln = Calendar.getInstance();
+ calo.setTime(oldDate);
+ caln.setTime(newDate);
+ if(type==0||type==1){
+ return calculateDaysBetweenDates(caln, calo) + 1;
+ }else if(type==2){
+ return calculateMonthsBetweenDates(caln, calo) + 1;
+ }else if(type==3){
+ return calculateYearsBetweenDates(caln, calo) + 1;
+ }
+ return -1;
+ }
+
+
+
+ public static int calculateDaysBetweenDates(Calendar startDate, Calendar endDate) {
+ long timeDiffInMillis = Math.abs(endDate.getTimeInMillis() - startDate.getTimeInMillis());
+ return (int)(timeDiffInMillis / (24 * 60 * 60 * 1000));
+ }
+
+ public static int calculateMonthsBetweenDates(Calendar startDate, Calendar endDate) {
+ int yearDiff = endDate.get(Calendar.YEAR) - startDate.get(Calendar.YEAR);
+ int monthDiff = endDate.get(Calendar.MONTH) - startDate.get(Calendar.MONTH);
+ if (monthDiff < 0 || (monthDiff == 0 && endDate.get(Calendar.DAY_OF_MONTH) < startDate.get(Calendar.DAY_OF_MONTH))) {
+ yearDiff--;
+ monthDiff += 12;
+ }
+ return yearDiff * 12 + monthDiff;
+ }
+
+ public static int calculateYearsBetweenDates(Calendar startDate, Calendar endDate) {
+ int yearDiff = endDate.get(Calendar.YEAR) - startDate.get(Calendar.YEAR);
+ if (yearDiff > 0 && (startDate.get(Calendar.MONTH) >= endDate.get(Calendar.MONTH) ||
+ (startDate.get(Calendar.MONTH) == endDate.get(Calendar.MONTH) && startDate.get(Calendar.DAY_OF_MONTH) <= endDate.get(Calendar.DAY_OF_MONTH)))) {
+ yearDiff--;
+ } else if (yearDiff < 0 && (startDate.get(Calendar.MONTH) <= endDate.get(Calendar.MONTH) ||
+ (startDate.get(Calendar.MONTH) == endDate.get(Calendar.MONTH) && startDate.get(Calendar.DAY_OF_MONTH) >= endDate.get(Calendar.DAY_OF_MONTH)))) {
+ yearDiff++;
+ }
+ return yearDiff;
+ }
+
+
+
/**
* 鍙栧緱涓庡師鏃ユ湡鐩稿樊涓�瀹氬ぉ鏁扮殑鏃ユ湡锛岃繑鍥濪ate鍨嬫棩鏈�
*
@@ -2910,11 +2956,16 @@
return w;
}
- public static Long twoDaysBetween(Date beginDate, Date endDate) throws ParseException {
+ public static Long twoDaysBetween(Date beginDate, Date endDate) {
long minute = (endDate.getTime() - beginDate.getTime()) / (60 * 1000);
return minute;
}
+ public static Integer daysBetweenDay(Date beginDate, Date endDate) {
+ long day = (endDate.getTime() - beginDate.getTime()) / (60 * 1000 * 60 * 24);
+ return Math.toIntExact(day);
+ }
+
/**
* 鍙栦袱鏈堜互鍓嶇殑1濂�
*
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
index cf2bc14..7e043a3 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.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;
@@ -72,10 +73,9 @@
@ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
private String startTime;
- @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
- @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
-
- private Date idcardNo;
+ @ApiModelProperty(value = "韬唤璇佸彿鐮�")
+ @ExcelColumn(name="韬唤璇佸彿鐮�")
+ private String idcardNo;
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)", example = "1")
@ExcelColumn(name="娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)")
@@ -93,4 +93,11 @@
@ExcelColumn(name="鎬у埆 0鐢� 1濂�")
private Integer sex;
+ @ApiModelProperty(value = "褰撳墠璐圭敤")
+ @ExcelColumn(name="褰撳墠璐圭敤")
+ private BigDecimal currentFee;
+
+ @ApiModelProperty(value = "鍛樺伐鍚嶇О")
+ @TableField(exist = false)
+ private String memberName;
}
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 545d243..4e65ee7 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
@@ -9,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;
/**
* 鎶曚繚鐢宠淇℃伅琛�
@@ -105,6 +108,13 @@
@ExcelColumn(name="鐘舵�� 0寰呭鏍� 1骞冲彴閫�鍥炰繚鍗曪紙宸查��鍥烇級 2宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔狅紙寰呯缃诧級 3宸茬绔犲緟涓婁紶淇濋櫓鍗曪紙寰呭嚭鍗曪級 4淇濆崟鍑哄叿澶辫触閫�鍥烇紙宸查��鍥烇級 5宸蹭笂浼犱繚鍗曪紙淇濋殰涓級6浼佷笟鐢宠閫�鍥炰腑 7骞冲彴鍚屾剰閫�鍥烇紙宸查��鍥烇級 8浼佷笟鍏抽棴 锛堝凡鍏抽棴锛�")
private Integer status;
+ @ApiModelProperty(value = "褰撳墠璐圭敤")
+ @ExcelColumn(name="褰撳墠璐圭敤")
+ private BigDecimal currentFee;
+
+ @ApiModelProperty(value = "鎬昏垂鐢�")
+ @ExcelColumn(name="鎬昏垂鐢�")
+ private BigDecimal fee;
@ApiModelProperty(value = "浼佷笟鍚嶇О")
@TableField(exist = false)
@@ -114,4 +124,9 @@
@TableField(exist = false)
private String solutionsName;
+ @ApiModelProperty(value = "浜哄憳淇℃伅")
+ @TableField(exist = false)
+ private List<ApplyDetail> applyDetailList;
+
+
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Member.java b/server/service/src/main/java/com/doumee/dao/business/model/Member.java
index 2975493..63bdb9c 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -67,10 +67,9 @@
@ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
private String startTime;
- @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
- @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
-
- private Date idcardNo;
+ @ApiModelProperty(value = "韬唤璇佸彿鐮�")
+ @ExcelColumn(name="韬唤璇佸彿鐮�")
+ private String idcardNo;
@ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany锛�", example = "1")
@ExcelColumn(name="浼佷笟缂栫爜锛堝叧鑱攃ompany锛�")
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
index 22471a2..0be110e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
@@ -127,10 +127,6 @@
if (pageWrap.getModel().getStartTime() != null) {
queryWrapper.lambda().eq(ApplyDetail::getStartTime, pageWrap.getModel().getStartTime());
}
- if (pageWrap.getModel().getIdcardNo() != null) {
- queryWrapper.lambda().ge(ApplyDetail::getIdcardNo, Utils.Date.getStart(pageWrap.getModel().getIdcardNo()));
- queryWrapper.lambda().le(ApplyDetail::getIdcardNo, Utils.Date.getEnd(pageWrap.getModel().getIdcardNo()));
- }
if (pageWrap.getModel().getDuId() != null) {
queryWrapper.lambda().eq(ApplyDetail::getDuId, pageWrap.getModel().getDuId());
}
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 25075c7..55425d6 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
@@ -1,29 +1,34 @@
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.InsuranceApplyMapper;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.dto.InsuranceApplyQueryDTO;
import com.doumee.dao.business.join.InsuranceApplyJoinMapper;
-import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.InsuranceApply;
-import com.doumee.dao.business.model.Solutions;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.InsuranceApplyService;
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 io.swagger.models.auth.In;
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.util.List;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 鎶曚繚鐢宠淇℃伅琛⊿ervice瀹炵幇
@@ -39,11 +44,134 @@
@Autowired
private InsuranceApplyJoinMapper insuranceApplyJoinMapper;
+ @Autowired
+ private ApplyDetailMapper applyDetailMapper;
+
+ @Autowired
+ private ApplyLogMapper applyLogMapper;
+
+ @Autowired
+ private SolutionsMapper solutionsMapper;
+
+ @Autowired
+ private MemberMapper memberMapper;
+ @Autowired
+ private DuSolutionMapper duSolutionMapper;
+ @Autowired
+ private DuWorktypeMapper duWorktypeMapper;
+
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer create(InsuranceApply insuranceApply) {
+ if (Objects.isNull(insuranceApply)
+ || Objects.isNull(insuranceApply.getSolutionId())
+ || Objects.isNull(insuranceApply.getApplyStartTime())
+ || Objects.isNull(insuranceApply.getApplyEndTime())
+ || !CollectionUtils.isNotEmpty(insuranceApply.getApplyDetailList())
+ ) {
+ 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(),"鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+ }
+ Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
+ }
+
+ List<ApplyDetail> applyDetailList = insuranceApply.getApplyDetailList();
+ //鍒ゆ柇鏄惁瀛樺湪閲嶅淇℃伅
+ List<Integer> memberIdList = applyDetailList.stream().map(i->i.getMemberId()).collect(Collectors.toList());
+ Set<Integer> set = new HashSet<>(memberIdList);
+ if(memberIdList.size() != set.size()){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鍛樺伐淇℃伅瀛樺湪閲嶅淇℃伅");
+ }
+ Constants.InsuranceApplyStatus insuranceApplyStatus = Constants.InsuranceApplyStatus.UPLOAD;
+ insuranceApply.setCreateDate(new Date());
+ insuranceApply.setCreator(loginUserInfo.getId());
+ insuranceApply.setIsdeleted(Constants.ZERO);
+ insuranceApply.setCompanyId(loginUserInfo.getCompanyId());
+ insuranceApply.setCheckInfo(insuranceApplyStatus.getName());
+ insuranceApply.setCheckDate(new Date());
+ insuranceApply.setCheckUserId(loginUserInfo.getId());
+ insuranceApply.setStatus(insuranceApplyStatus.getKey());
insuranceApplyMapper.insert(insuranceApply);
+ //鏌ヨ淇濋櫓鏂规涓嬬殑鎵�鏈夋淳閬ｅ崟浣�
+ 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(),"鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌宸ョ淇℃伅");
+ }
+ for (int i = 0; i < applyDetailList.size(); i++) {
+ ApplyDetail applyDetail = applyDetailList.get(i);
+ if(Objects.isNull(applyDetail)
+ ||Objects.isNull(applyDetail.getMemberId())
+ ||Objects.isNull(applyDetail.getDuId())
+ ||Objects.isNull(applyDetail.getWorktypeId())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚鍛樺伐淇℃伅鏁版嵁缂哄け");
+ }
+ applyDetail.setCreateDate(new Date());
+ applyDetail.setCreator(loginUserInfo.getId());
+ applyDetail.setIsdeleted(Constants.ZERO);
+ applyDetail.setSortnum(i);
+ applyDetail.setApplyId(insuranceApply.getId());
+ if(Objects.isNull(applyDetail.getMemberId())){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ヤ俊鎭瓨鍦ㄥ紓甯告暟鎹紒");
+ }
+ Member member = memberMapper.selectById(applyDetail.getMemberId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ヤ俊鎭瓨鍦ㄥ紓甯告暟鎹紒");
+ }
+ applyDetail.setIdcardNo(member.getIdcardNo());
+ applyDetail.setSex(member.getSex());
+ applyDetail.setFee(this.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()+"銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+ }
+ if(duWorktypeList.stream().filter(d->d.getDuSolutionId().equals(applyDetail.getDuId())&&d.getWorkTypeId().equals(applyDetail.getWorktypeId()))
+ .collect(Collectors.toList()).size()<=Constants.ZERO){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
+ }
+ applyDetailMapper.insert(applyDetail);
+ }
+
return insuranceApply.getId();
}
+
+
+ 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");
+// Date date2 = DateUtil.StringToDate("2023-04-01 00:00:00");
+// System.out.println(DateUtil.calculateBetween(date1,date2,0));
+// System.out.println(DateUtil.calculateBetween(date1,date2,1));
+// System.out.println(DateUtil.calculateBetween(date1,date2,2));
+// System.out.println(DateUtil.calculateBetween(date1,date2,3));
+//
+// }
+
@Override
public void deleteById(Integer id) {
@@ -106,8 +234,7 @@
queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName);
queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName);
queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
-
-
+ //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
if(loginUserInfo.getType().equals(Constants.ONE)){
queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
}
@@ -139,9 +266,12 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(insuranceApplyJoinMapper.selectJoinPage(page,InsuranceApply.class, queryWrapper));
+ PageData<InsuranceApply> pageData = PageData.from(insuranceApplyJoinMapper.selectJoinPage(page,InsuranceApply.class, queryWrapper));
+ return pageData;
}
+
+
@Override
public long count(InsuranceApply insuranceApply) {
QueryWrapper<InsuranceApply> wrapper = new QueryWrapper<>(insuranceApply);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index e000777..559352f 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -124,10 +124,6 @@
if (pageWrap.getModel().getStartTime() != null) {
queryWrapper.lambda().eq(Member::getStartTime, pageWrap.getModel().getStartTime());
}
- if (pageWrap.getModel().getIdcardNo() != null) {
- queryWrapper.lambda().ge(Member::getIdcardNo, Utils.Date.getStart(pageWrap.getModel().getIdcardNo()));
- queryWrapper.lambda().le(Member::getIdcardNo, Utils.Date.getEnd(pageWrap.getModel().getIdcardNo()));
- }
if (pageWrap.getModel().getCompanyId() != null) {
queryWrapper.lambda().eq(Member::getCompanyId, pageWrap.getModel().getCompanyId());
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/TaxDetialServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/TaxDetialServiceImpl.java
index 61c8a92..8a46ddd 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/TaxDetialServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/TaxDetialServiceImpl.java
@@ -115,9 +115,6 @@
if (pageWrap.getModel().getInsuranceApplyId() != null) {
queryWrapper.lambda().eq(TaxDetial::getInsuranceApplyId, pageWrap.getModel().getInsuranceApplyId());
}
- if (pageWrap.getModel().getApplyHcangeId() != null) {
- queryWrapper.lambda().eq(TaxDetial::getApplyHcangeId, pageWrap.getModel().getApplyHcangeId());
- }
if (pageWrap.getModel().getDelTaxId() != null) {
queryWrapper.lambda().eq(TaxDetial::getDelTaxId, pageWrap.getModel().getDelTaxId());
}
@@ -126,9 +123,6 @@
}
if (pageWrap.getModel().getFee() != null) {
queryWrapper.lambda().eq(TaxDetial::getFee, pageWrap.getModel().getFee());
- }
- if (pageWrap.getModel().getTOTAlFee() != null) {
- queryWrapper.lambda().eq(TaxDetial::getTOTAlFee, pageWrap.getModel().getTOTAlFee());
}
if (pageWrap.getModel().getType() != null) {
queryWrapper.lambda().eq(TaxDetial::getType, pageWrap.getModel().getType());
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
index ed4cc96..8f35fa4 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
@@ -20,14 +20,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import jdk.nashorn.internal.runtime.options.LoggingOption;
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.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import org.yaml.snakeyaml.scanner.Constant;
import java.util.ArrayList;
import java.util.Date;
--
Gitblit v1.9.3