Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

nidapeng

2024-04-01 8d41256df46a71c29bbe9cf8b25530b7691311c0

Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

# Conflicts:
#	server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java

 server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java

@@ -128,6 +128,7 @@
    @ApiModelProperty(value = "服务天数")
    @TableField(exist = false)
    private Integer serviceDays;

    @ApiModelProperty(value = "投保人数")
    @TableField(exist = false)
    private Integer insureNum;
@@ -135,6 +136,11 @@
    @TableField(exist = false)
    private String statusInfo;


    @ApiModelProperty(value = "日志记录")
    @TableField(exist = false)
    private List<ApplyLog> applyLogList;

    @ApiModelProperty(value = "人员信息")
    @TableField(exist = false)
    private List<ApplyDetail> applyDetailList;

 server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java

@@ -13,9 +13,11 @@
import com.doumee.dao.business.*;
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.join.ApplyDetailJoinMapper;
import com.doumee.dao.business.join.ApplyLogJoinMapper;
import com.doumee.dao.business.join.InsuranceApplyJoinMapper;
import com.doumee.dao.business.join.UnionApplyJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.UnionApplyService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -79,6 +81,8 @@
    private SmsEmailService smsEmailService;
    @Autowired
    private ApplyLogMapper applyLogMapper;
    @Autowired
    private ApplyLogJoinMapper applyLogJoinMapper;

    @Value("${debug_model}")
    private boolean debugModel;
@@ -314,6 +318,21 @@
            }
        }
        initStatusInfo(unionApply);

        //查询操作记录
        List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
                new MPJLambdaWrapper<ApplyLog>()
                        .selectAll(ApplyLog.class)
                        .selectAs(SystemUser::getRealname,ApplyLog::getCreatorName)
                        .selectAs(Company::getName,ApplyLog::getCompanyName)
                        .selectAs(SystemUser::getType,ApplyLog::getCreatorType)
                        .leftJoin(SystemUser.class,SystemUser::getId,ApplyLog::getCreator)
                        .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                        .in(ApplyLog::getObjType,Constants.ApplyLogType.getTypeList(Constants.THREE))
                        .eq(ApplyLog::getApplyId,unionApply.getId())
                        .orderByAsc(ApplyLog::getCreateDate)
        );
        unionApply.setApplyLogList(applyLogList);
        return unionApply;
    }

@@ -763,9 +782,14 @@
            multifileMapper.insert(multifile);
        }


        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_UPLOAD_TBD;
        ApplyLog log = new ApplyLog(unionApply,applyLogType.getName(), null
        String info = "";
        if(Objects.nonNull(unionApplyBXDDTO.getStartTime())&&Objects.nonNull(unionApplyBXDDTO.getEndTime())){
            info =applyLogType.getInfo();
            info = info.replace("${param1}",DateUtil.getPlusTime2(unionApplyBXDDTO.getStartTime()));
            info = info.replace("${param2}",DateUtil.getPlusTime2(unionApplyBXDDTO.getEndTime()));
        }
        ApplyLog log = new ApplyLog(unionApply,applyLogType.getName(), info
                ,unionApply.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionApply));
        applyLogMapper.insert(log);