diff --git a/src/main/java/cn/timer/api/controller/insure/InsureApplicantController.java b/src/main/java/cn/timer/api/controller/insure/InsureApplicantController.java index 91581a6..eefda4c 100644 --- a/src/main/java/cn/timer/api/controller/insure/InsureApplicantController.java +++ b/src/main/java/cn/timer/api/controller/insure/InsureApplicantController.java @@ -6,6 +6,7 @@ import java.util.Optional; import java.util.Random; import cn.timer.api.bean.insure.InsureApplicant; +import cn.timer.api.bean.qyzx.QyzxEntInfoM; import cn.timer.api.config.annotation.CurrentUser; import cn.timer.api.config.annotation.UserBean; import cn.timer.api.dao.insure.InsureApplicantMapper; @@ -48,22 +49,49 @@ public class InsureApplicantController { @PostMapping("/insureApplicationSetting") @ApiOperation(value = "设置投保人", httpMethod = "POST", notes = "投保申请") private Result<Object> insureApplicationSetting(@RequestBody InsureApplicant params) { - InsureApplicant insureApplicant = InsureApplicant.builder().id(1).build().selectById();if(insureApplicant==null){ - params.insert(); - return ResultUtil.data(params); - } + InsureApplicant insureApplicant = InsureApplicant.builder().build().selectOne(new QueryWrapper<InsureApplicant>().lambda().eq(InsureApplicant::getOrgCode,params.getOrgCode())); params.setId(insureApplicant.getId()); params.updateById(); return ResultUtil.data(params); } + @GetMapping("/getApplicantAdmin") + @ApiOperation(value = "获取投保人--运营后台", httpMethod = "GET", notes = "获取投保人") + private Result<Object> getApplicant(@RequestParam("orgCode") Integer orgCode) { + InsureApplicant insureApplicant = InsureApplicant.builder().build().selectOne(new QueryWrapper<InsureApplicant>().lambda().eq(InsureApplicant::getOrgCode,orgCode)); + if(insureApplicant==null){ + QyzxEntInfoM qyzxEntInfoM=QyzxEntInfoM.builder().id(orgCode).build().selectById(); + insureApplicant = getInsureApplicant(qyzxEntInfoM); + insureApplicant.setOrgCode(orgCode); + insureApplicant.insert(); + } + return ResultUtil.data(insureApplicant); + } + + private InsureApplicant getInsureApplicant(QyzxEntInfoM qyzxEntInfoM) { + InsureApplicant insureApplicant; + insureApplicant=new InsureApplicant(); + insureApplicant.setApplicantEName(qyzxEntInfoM.getName()); + insureApplicant.setApplicantEAddress(qyzxEntInfoM.getWorkAddress()); + insureApplicant.setApplicantEContacts(qyzxEntInfoM.getOperName());/*这里为避免联系人为空,默认使用法人*/ + insureApplicant.setApplicantEPhone(qyzxEntInfoM.getPhone());/*这里为避免联系人为空,默认使用法人*/ + insureApplicant.setApplicantType("2"); + insureApplicant.setApplicantENoType("3646"); + insureApplicant.setApplicantENo(qyzxEntInfoM.getCreditCode()); + insureApplicant.setApplicantProvinceCity("21721"); + return insureApplicant; + } + @GetMapping("/getApplicant") - @ApiOperation(value = "获取投保人", httpMethod = "GET", notes = "获取投保人") - private Result<Object> getApplicant() { - InsureApplicant insureApplicant = InsureApplicant.builder().id(1).build().selectById(); + @ApiOperation(value = "获取投保人--8小时", httpMethod = "GET", notes = "获取投保人") + private Result<Object> getApplicant(@CurrentUser UserBean userBean) { + InsureApplicant insureApplicant = InsureApplicant.builder().build().selectOne(new QueryWrapper<InsureApplicant>().lambda().eq(InsureApplicant::getOrgCode,userBean.getOrgCode())); if(insureApplicant==null){ - return ResultUtil.data(null); + QyzxEntInfoM qyzxEntInfoM=QyzxEntInfoM.builder().id(userBean.getOrgCode()).build().selectById(); + insureApplicant = getInsureApplicant(qyzxEntInfoM); + insureApplicant.setOrgCode(userBean.getOrgCode()); + insureApplicant.insert(); } return ResultUtil.data(insureApplicant); } diff --git a/src/main/java/cn/timer/api/controller/insure/InsureContorll.java b/src/main/java/cn/timer/api/controller/insure/InsureContorll.java index d7fb980..ac561fd 100644 --- a/src/main/java/cn/timer/api/controller/insure/InsureContorll.java +++ b/src/main/java/cn/timer/api/controller/insure/InsureContorll.java @@ -164,7 +164,7 @@ public class InsureContorll { quotations.put("operator_name", "");//*币种:5人民币 /*企业信息*/ - InsureApplicant insureApplicant = InsureApplicant.builder().id(1).build().selectById(); + InsureApplicant insureApplicant = InsureApplicant.builder().build().selectOne(new QueryWrapper<InsureApplicant>().lambda().eq(InsureApplicant::getOrgCode,qyzxEntInfoM.getId())); if (insureApplicant == null) { return ResultUtil.error("未设置投保人"); } @@ -878,9 +878,11 @@ public class InsureContorll { @PostMapping(value = "/policyTotalList") @ApiOperation(value = "11.保单统计列表 -- 8小时端", httpMethod = "POST", notes = "保单统计列表") - public Result<Object> policyTotal(@CurrentUser UserBean userBean, @RequestBody Page page) { + public Result<Object> policyTotal(@CurrentUser UserBean userBean) { + Map map=Maps.newHashMap(); List<InsureUserDto> list = insurePolicyMapper.selectPlansListByorgCode(userBean.getOrgCode()); - return ResultUtil.data(list); + map.put("list",list); + return ResultUtil.data(map); } @@ -1261,7 +1263,7 @@ public class InsureContorll { insureUser.setStatus("1"); insureUser.insert(); } - InsureLog.builder().requestParam(JSONObject.toJSONString(map)).type(6).createTime(new Date()).requestType(2).returnBody(data).requestPath(policyDetailUrl) + InsureLog.builder().requestParam(JSONObject.toJSONString(map)).type(9).createTime(new Date()).requestType(2).returnBody(data).requestPath(policyDetailUrl) .returnCode(returnMap.get("errcode").toString()).returnMsg(returnMap.get("errmsg").toString()).policyId(policy.getId()).build().insert(); } catch (IOException e) { e.printStackTrace(); diff --git a/src/main/java/cn/timer/api/controller/insure/InsureUserController.java b/src/main/java/cn/timer/api/controller/insure/InsureUserController.java index cee2027..4f28feb 100644 --- a/src/main/java/cn/timer/api/controller/insure/InsureUserController.java +++ b/src/main/java/cn/timer/api/controller/insure/InsureUserController.java @@ -64,7 +64,7 @@ public class InsureUserController{ @ApiOperation(value = "3.保单列表--8小时端", httpMethod = "POST", notes = "保单列表") public Result<Object> userPolicyList(@CurrentUser UserBean userBean, @RequestBody PolicyDto policyDto) { Map map = Maps.newHashMap(); - InsurePolicy insurePolicy = InsurePolicy.builder().build().selectOne(new QueryWrapper<InsurePolicy>().lambda().eq(InsurePolicy::getOrgCode,userBean.getOrgCode()).eq(InsurePolicy::getStatus,1)); + InsurePolicy insurePolicy = InsurePolicy.builder().build().selectOne(new QueryWrapper<InsurePolicy>().lambda().eq(InsurePolicy::getId,policyDto.getId())); if(insurePolicy==null){ return ResultUtil.error("保单号不存在"); } diff --git a/src/main/java/cn/timer/api/dao/insure/InsurePolicyMapper.java b/src/main/java/cn/timer/api/dao/insure/InsurePolicyMapper.java index bbb7174..96a247c 100644 --- a/src/main/java/cn/timer/api/dao/insure/InsurePolicyMapper.java +++ b/src/main/java/cn/timer/api/dao/insure/InsurePolicyMapper.java @@ -28,5 +28,6 @@ public interface InsurePolicyMapper extends BaseMapper<InsurePolicy> { List<InsureUserDto> selectPlansListByorgCode(@Param("orgCode")Integer id); List<InsurePolicy> selectPolicyListByStatus(@Param("date") Date date); + Integer selectPlansTotalByorgCode(@Param("orgCode")Integer id); } diff --git a/src/main/resources/mapping/insure/InsurePolicyMapper.xml b/src/main/resources/mapping/insure/InsurePolicyMapper.xml index 572a6bf..c567d9d 100644 --- a/src/main/resources/mapping/insure/InsurePolicyMapper.xml +++ b/src/main/resources/mapping/insure/InsurePolicyMapper.xml @@ -243,7 +243,8 @@ ip.policy_date_end as policyDateEnd, sum(iu.price) AS totalPremium, ip.update_time AS updateTime, - ip.`status` as `status` + ip.`status` as `status`, + ip.org_code as orgCode FROM insure_policy ip LEFT JOIN insure_user iu ON iu.policy_id = ip.id @@ -347,6 +348,14 @@ iu.benefit_basic_plan, iu.benefit_occupation_category </select> + <select id="selectPlansTotalByorgCode" resultType="java.lang.Integer"> + SELECT + count(ip.id) + FROM + insure_policy ip + LEFT JOIN insure_user iu ON iu.policy_id = ip.id + WHERE ip.org_code=#{orgCode} + </select> <select id="selectPolicyListByStatus" resultType="cn.timer.api.bean.insure.InsurePolicy"> select * from insure_policy