Commit 061d8c98 authored by huyuchen's avatar huyuchen

huych-风险管控提交

parent 099fd84c
...@@ -12,7 +12,6 @@ import lombok.EqualsAndHashCode; ...@@ -12,7 +12,6 @@ import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.util.Date;
/** /**
* 风险管控统计 * 风险管控统计
...@@ -186,7 +185,7 @@ public class TRiskMonitor extends BaseEntity { ...@@ -186,7 +185,7 @@ public class TRiskMonitor extends BaseEntity {
@ExcelAttribute(name = "最后一次发薪日期", isDate = true) @ExcelAttribute(name = "最后一次发薪日期", isDate = true)
@ExcelProperty("最后一次发薪日期") @ExcelProperty("最后一次发薪日期")
@Schema(description = "最后一次发薪日期") @Schema(description = "最后一次发薪日期")
private Date lastSalaryTime; private String lastSalaryTime;
/** /**
* 所属客户名称 * 所属客户名称
......
...@@ -20,7 +20,7 @@ import java.util.Date; ...@@ -20,7 +20,7 @@ import java.util.Date;
*/ */
@Data @Data
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ColumnWidth(25) @ColumnWidth(15)
public class TRiskMonitorVo implements Serializable { public class TRiskMonitorVo implements Serializable {
/** /**
...@@ -167,10 +167,10 @@ public class TRiskMonitorVo implements Serializable { ...@@ -167,10 +167,10 @@ public class TRiskMonitorVo implements Serializable {
/** /**
* 最后发薪日期 * 最后发薪日期
*/ */
@ExcelAttribute(name = "最后一次发薪日期", isDate = true) @ExcelAttribute(name = "最后一次发薪日期")
@ExcelProperty("最后一次发薪日期") @ExcelProperty("最后一次发薪日期")
@Schema(description = "最后一次发薪日期") @Schema(description = "最后一次发薪日期")
private Date lastSalaryTime; private String lastSalaryTime;
/** /**
* 所属客户名称 * 所属客户名称
......
...@@ -104,7 +104,7 @@ public class TRiskMonitorController { ...@@ -104,7 +104,7 @@ public class TRiskMonitorController {
@Operation(description = "生成风险管控统计") @Operation(description = "生成风险管控统计")
@Inner @Inner
@PostMapping("/inner/createRiskMonitor") @PostMapping("/inner/createRiskMonitor")
public void createRiskMonitor() throws IllegalAccessException{ public void createRiskMonitor(){
tRiskMonitorService.createRiskMonitor(); tRiskMonitorService.createRiskMonitor();
} }
......
...@@ -125,7 +125,7 @@ public class TRiskMonitorServiceImpl extends ServiceImpl<TRiskMonitorMapper, TRi ...@@ -125,7 +125,7 @@ public class TRiskMonitorServiceImpl extends ServiceImpl<TRiskMonitorMapper, TRi
public void createRiskMonitor() { public void createRiskMonitor() {
//批量删除之前生成的管控统计 //批量删除之前生成的管控统计
baseMapper.delete(Wrappers.<TRiskMonitor>query().lambda() baseMapper.delete(Wrappers.<TRiskMonitor>query().lambda()
.eq(TRiskMonitor::getDeleteFlag, CommonConstants.ONE_STRING)); .eq(TRiskMonitor::getDeleteFlag, CommonConstants.ZERO_STRING));
//批量生成统计数据 //批量生成统计数据
List<TRiskMonitor> list = baseMapper.selectRiskMonitorList(); List<TRiskMonitor> list = baseMapper.selectRiskMonitorList();
if (!list.isEmpty()) { if (!list.isEmpty()) {
......
...@@ -221,14 +221,14 @@ ...@@ -221,14 +221,14 @@
select A.id as DEPT_ID, select A.id as DEPT_ID,
a.DEPART_NAME, a.DEPART_NAME,
a.DEPART_NO, a.DEPART_NO,
a.SECOND_INDICATOR_BELONG, ifnull(a.SECOND_INDICATOR_BELONG,'') SECOND_INDICATOR_BELONG,
a.CUSTOMER_NAME, a.CUSTOMER_NAME,
a.CUSTOMER_NO, a.CUSTOMER_NO,
a.BUSINESS_SECOND_TYPE, ifnull(a.BUSINESS_SECOND_TYPE,'') BUSINESS_SECOND_TYPE,
a.BUSINESS_PRIMARY_TYPE, ifnull(a.BUSINESS_PRIMARY_TYPE,'') BUSINESS_PRIMARY_TYPE,
a.BUSINESS_THIRD_TYPE, ifnull(a.BUSINESS_THIRD_TYPE,'') BUSINESS_THIRD_TYPE,
a.BU_BELONG, ifnull(a.BU_BELONG,'') BU_BELONG,
a.LINE_TYPE, ifnull(a.LINE_TYPE,'') LINE_TYPE,
CONCAT(if(ifnull(pro.countPer,0) > ifnull(q.onContractNum,0),'合同漏签 / ','') CONCAT(if(ifnull(pro.countPer,0) > ifnull(q.onContractNum,0),'合同漏签 / ','')
,if(ifnull(ht.countContract,0) - ifnull(q.onContractNum,0) > 0,'合同漏减 / ','') ,if(ifnull(ht.countContract,0) - ifnull(q.onContractNum,0) > 0,'合同漏减 / ','')
,if(ifnull(pro.countPer,0) > ifnull(r.onInsuranceNum,0),'商险漏买 / ','') ,if(ifnull(pro.countPer,0) > ifnull(r.onInsuranceNum,0),'商险漏买 / ','')
...@@ -261,8 +261,11 @@ ...@@ -261,8 +261,11 @@
ifnull(fu.countFund, 0) - ifnull(e.onFundNum, 0) UNPRO_FUND_NUM, ifnull(fu.countFund, 0) - ifnull(e.onFundNum, 0) UNPRO_FUND_NUM,
ifnull(sx.countInsurance, 0) - ifnull(r.onInsuranceNum, 0) UNPRO_INSURANCE_NUM, ifnull(sx.countInsurance, 0) - ifnull(r.onInsuranceNum, 0) UNPRO_INSURANCE_NUM,
ifnull(sa.countSalary, 0) - ifnull(t.onSalaryNum, 0) UNPRO_SALARY_NUM, ifnull(sa.countSalary, 0) - ifnull(t.onSalaryNum, 0) UNPRO_SALARY_NUM,
sa.CREATE_TIME LAST_SALARY_TIME, ifnull(DATE_FORMAT(sa.CREATE_TIME,'%Y-%m-%d %H:%i:%s'),'') LAST_SALARY_TIME,
ifnull(pro.countPer, 0) ROJECT_NUM ifnull(pro.countPer, 0) PROJECT_NUM,
'1' create_by,
'超管' create_name,
'1' UPDATE_BY
from t_settle_domain a from t_settle_domain a
left join ( left join (
select a.DEPT_NO, select a.DEPT_NO,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment