8小时操作人员

e9639429 · 翁国栋 · 87569c0a · e9639429 · e9639429 · e9639429
Commit e9639429 authored 2 years ago by 翁国栋
4 changed files
--- a/src/main/java/cn/timer/api/controller/insure/InsureContorll.java
+++ b/src/main/java/cn/timer/api/controller/insure/InsureContorll.java
@@ -183,7 +183,6 @@ public class InsureContorll {
    @ApiOperation(value = "1.投保申请", httpMethod = "POST", notes = "投保申请")
    @Transactional(rollbackFor = Exception.class)
    public Result<Object> insured_add(@RequestBody InsureDto insureDto) {
-        log.info("/insured_add");
        try {
        InsureProduct insureProduct = InsureProduct.builder().id(Integer.parseInt(insureDto.getProductId())).build().selectById();
        List<InsureProductPlan> priceList = InsureProductPlan.builder().build().selectList(new QueryWrapper<InsureProductPlan>().lambda()
@@ -374,7 +373,7 @@ public class InsureContorll {
                    InsureLog.builder().requestParam(JSONObject.toJSONString(setParams(JSONObject.toJSONString(bodyMap), appid, secret))).type(1)
                            .requestData(JSONObject.toJSONString(bodyMap)).createTime(new Date()).requestType(1).returnBody(JSONObject.toJSONString(dataMap)).requestPath(insuredUrl)
                            .returnCode(dataMap.get("errcode").toString())
-                            .returnMsg(dataMap.get("errmsg").toString()).companyName(qyzxEntInfoM.getName()).policyId(insurePolicy.getId()).fileUrl(url).build().insert();
+                            .returnMsg(dataMap.get("errmsg").toString()).userType(insureDto.getMethod()).userName(insureDto.getOperatorName()).companyName(insureDto.getOperatorCompanyName()).policyId(insurePolicy.getId()).fileUrl(url).build().insert();
                    for (PlansDto p : insureDto.getPlans()) {
                        List<YgglMainEmp> ygglMainEmpList = ygglMainEmpMapper.selectListByIds(p.getUserIds());
                        InsureUser insureUser;
@@ -531,20 +530,20 @@ public class InsureContorll {
                if (status.equals("5") || status.equals("6") || status.equals("7")) {
                    InsureLog.builder().requestParam(JSONObject.toJSONString(setParams(JSONObject.toJSONString(bodyMap), appid, secret))).type(2)
                            .requestData(JSONObject.toJSONString(bodyMap)).createTime(new Date()).requestType(1).returnBody(responData).requestPath(batchUrl)
-                            .returnCode(dataMap.get("errcode").toString()).returnMsg(dataMap.get("errmsg").toString()).policyId(insurePolicy.getId()).transId("IS_" + insurePolicy.getOrgCode() + "_" + dtf2.format(now)).fileUrl(data.get("file_url").toString()).build().insert();
+                            .returnCode(dataMap.get("errcode").toString()).userType(insureDto.getMethod()).userName(insureDto.getOperatorName()).companyName(insureDto.getOperatorCompanyName()).returnMsg(dataMap.get("errmsg").toString()).policyId(insurePolicy.getId()).transId("IS_" + insurePolicy.getOrgCode() + "_" + dtf2.format(now)).fileUrl(data.get("file_url").toString()).build().insert();
 //                    return ResultUtil.error("信息填写错误，请查看日志");
                    throw new CustomException("信息填写错误，请查看日志");
                } else {
                    InsureLog.builder().requestParam(JSONObject.toJSONString(setParams(JSONObject.toJSONString(bodyMap), appid, secret))).type(2)
                            .requestData(JSONObject.toJSONString(bodyMap)).createTime(new Date()).requestType(1).returnBody(responData).requestPath(batchUrl)
-                            .returnCode(dataMap.get("errcode").toString()).returnMsg(dataMap.get("errmsg").toString()).policyId(insurePolicy.getId()).fileUrl(url).build().insert();
+                            .returnCode(dataMap.get("errcode").toString()).userType(insureDto.getMethod()).userName(insureDto.getOperatorName()).companyName(insureDto.getOperatorCompanyName()).returnMsg(dataMap.get("errmsg").toString()).policyId(insurePolicy.getId()).fileUrl(url).build().insert();
                    return ResultUtil.success("核保中，等待系统更新");
                }
            }
            InsureLog.builder().requestParam(JSONObject.toJSONString(setParams(JSONObject.toJSONString(bodyMap), appid, secret))).type(2)
                    .requestData(JSONObject.toJSONString(bodyMap)).createTime(new Date()).requestType(1).returnBody(responData).requestPath(batchUrl)
-                    .returnCode(dataMap.get("errcode").toString()).returnMsg(dataMap.get("errmsg").toString()).policyId(insurePolicy.getId()).build().insert();
+                    .returnCode(dataMap.get("errcode").toString()).userType(insureDto.getMethod()).userName(insureDto.getOperatorName()).companyName(insureDto.getOperatorCompanyName()).returnMsg(dataMap.get("errmsg").toString()).policyId(insurePolicy.getId()).build().insert();
            return ResultUtil.error(dataMap.get("errmsg").toString());
        } catch (Exception e) {
            log.error("增员异常：", e);
@@ -644,7 +643,7 @@ public class InsureContorll {
            Map<String, Object> dataMap = JSONObject.parseObject(responData);
            InsureLog.builder().requestParam(JSONObject.toJSONString(setParams(JSONObject.toJSONString(bodyMap), appidq, secretq))).type(3)
                    .requestData(JSONObject.toJSONString(bodyMap)).createTime(new Date()).requestType(1).returnBody(responData).requestPath(batchUrl)
-                    .returnCode(dataMap.get("errcode").toString()).returnMsg(dataMap.get("errmsg").toString()).policyId(insurePolicy.getId()).fileUrl(url).build().insert();
+                    .returnCode(dataMap.get("errcode").toString()).userType(insureDto.getMethod()).userName(insureDto.getOperatorName()).companyName(insureDto.getOperatorCompanyName()).returnMsg(dataMap.get("errmsg").toString()).policyId(insurePolicy.getId()).fileUrl(url).build().insert();
            if (dataMap.get("errcode").toString().equals("suc")) {
                Map<String, Object> data = JSONObject.parseObject(JSONObject.toJSONString(dataMap.get("data")));
                Map<String, Object> orderImportInfo = JSONObject.parseObject(JSONObject.toJSONString(data.get("order_import_info")));
@@ -652,7 +651,7 @@ public class InsureContorll {
                if (status.equals("5") || status.equals("6") || status.equals("7")) {
                    InsureLog.builder().requestParam(JSONObject.toJSONString(setParams(JSONObject.toJSONString(bodyMap), appidq, secretq))).type(2)
                            .requestData(JSONObject.toJSONString(bodyMap)).createTime(new Date()).requestType(1).returnBody(responData).requestPath(batchUrl)
-                            .returnCode(dataMap.get("errcode").toString()).returnMsg(dataMap.get("errmsg").toString()).policyId(insurePolicy.getId()).transId("RP_" + insurePolicy.getOrgCode() + "_" + dtf2.format(now)).fileUrl(data.get("file_url").toString()).build().insert();
+                            .returnCode(dataMap.get("errcode").toString()).userType(insureDto.getMethod()).userName(insureDto.getOperatorName()).companyName(insureDto.getOperatorCompanyName()).returnMsg(dataMap.get("errmsg").toString()).policyId(insurePolicy.getId()).transId("RP_" + insurePolicy.getOrgCode() + "_" + dtf2.format(now)).fileUrl(data.get("file_url").toString()).build().insert();
                    //TODO 写入日志
                    return ResultUtil.error("信息填写错误，请查看日志");
                } else {
@@ -1444,6 +1443,7 @@ public class InsureContorll {
                    y = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getZjNum, iu.getInsuredNo())
                            .eq(YgglMainEmp::getName, iu.getInsuredEContact()).eq(YgglMainEmp::getOrgCode, qyzxEntInfoM.getId()));
                    if (y == null) {
+                        //避免出现空指针异常以及
                        QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().pw(Md5.md5(pwd)).phone(String.valueOf(System.currentTimeMillis())).regTime(now).orgId(qyzxEntInfoM.getId()).username(iu.getInsuredEContact()).sts(CommonEnum.U_STS_ON.getType()).build();
                        qyzxEmpLogin.insert();
                        y = new YgglMainEmp();

--- a/src/main/java/cn/timer/api/controller/insure/InsureUserController.java
+++ b/src/main/java/cn/timer/api/controller/insure/InsureUserController.java
@@ -128,16 +128,10 @@ public class InsureUserController{
        policyDto.setPolicyDateStart(policyDateStart);
        policyDto.setPlanId(planId);
        policyDto.setCategoryId(categoryId);
-        Page page=new Page();
+        policyDto.setPage(null);
-        page.setOffset(null);
-        page.setTotalPage(null);
-        policyDto.setPage(page);
        List<PolicyDto> userList = insureUserMapper.selectPolicyList(policyDto);
        String[] rowName = new String[]{"编号", "姓名", "证件类型", "证件号", "保单号", "状态", "计划", "保险生效时间", "保险失效时间"};
        List<Object[]> list = null;
-//        for ()
-//        XSSFWorkbook xssfWorkbook = ExcelUtils.exportExcel("导出人员清单.xlsx", rowName, list);
        OutputStream os = null;
        try {
            resp.setContentType("application/octet-stream");

--- a/src/main/java/cn/timer/api/dto/insure/InsureDto.java
+++ b/src/main/java/cn/timer/api/dto/insure/InsureDto.java
@@ -41,5 +41,8 @@ public class InsureDto {
    private String idCardNo;
    private String reason;/*批改原因*/
    private Integer payType=1;/*支付方式 默认是在线支付*/
+    private String operatorName="admin";//投保人名字
+    private String operatorCompanyName="运营后台";
+    private Integer method=2;//提交1方式 1是八小时后台 2是后台
 //    private String
 }
--- a/src/main/resources/mapping/insure/InsureLogMapper.xml
+++ b/src/main/resources/mapping/insure/InsureLogMapper.xml
@@ -214,14 +214,15 @@
        ip.policy_no,
        log.user_name,
        log.policy_id,
-        q.`name` as companyName,
        log.create_time,
        log.return_code,
        log.file_url,
-        log.type
+        log.user_type,
+        log.user_name,
+        log.company_name,
+               log.type
        from insure_log log
        LEFT JOIN insure_policy ip on ip.id = log.policy_id
-        LEFT JOIN qyzx_ent_info_m q on q.id = ip.org_code
        WHERE log.type in (1,2,3,7,8)
        <if test="param.policyNo!=null and param.policyNo != ''">
            and ip.policy_no = #{param.policyNo}