Merge remote-tracking branch 'origin/master'

picc-common/src/main/java/com/jpsoft/picc/modules/base/service/impl/TemplateMessageServiceImpl.java

@@ -229,7 +229,9 @@ public class TemplateMessageServiceImpl implements TemplateMessageService {
 		jsonVars.put("time", DateTime.now().toString("yyyy-MM-dd HH:mm"));
 		jsonVars.put("insuredName",insuranceApplication.getInsuredName());  //投保人都是人才超市
 		jsonVars.put("companyName",companyName);  //增加显示被保险人企业名称
+		jsonVars.put("type", insurancePolicy.getNo()>1 ? "下月" : "新增");
 		jsonVars.put("insuranceName",insuranceApplication.getDefinitionName());
+
 		jsonVars.put("duration",sdf.format(insurancePolicy.getStartTime()) + "至" + sdf.format(insurancePolicy.getEndTime()));
 
 		String json = VelocityHelper.format(templateMessage.getJson(),jsonVars);

picc-common/src/main/java/com/jpsoft/picc/modules/common/utils/ItextPDFUtil.java

@@ -207,7 +207,7 @@ public class ItextPDFUtil {
         table.addCell(PdfTable.createCell("被保险人信息", textfont, Element.ALIGN_CENTER,1,5,BaseColor.WHITE,false));
 
         table.addCell(PdfTable.createCell("名    称", textfont, Element.ALIGN_CENTER,1,1,BaseColor.WHITE,false));
-        table.addCell(PdfTable.createCell(insuranceApplication.getInsuredName(), textfont, Element.ALIGN_CENTER,3,1,BaseColor.WHITE,false));
+        table.addCell(PdfTable.createCell(insuranceApplication.getCompanyName(), textfont, Element.ALIGN_CENTER,3,1,BaseColor.WHITE,false));
         table.addCell(PdfTable.createCell("营业性质", textfont, Element.ALIGN_CENTER,1,1,BaseColor.WHITE,false));
         table.addCell(PdfTable.createCell(insuranceApplication.getBusinessNatureN(), textfont, Element.ALIGN_CENTER,1,1,BaseColor.WHITE,false));
 

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/CompanyMemberController.java

@@ -4,9 +4,11 @@ import cn.hutool.core.convert.Convert;
 import com.github.pagehelper.Page;
 import com.jpsoft.picc.modules.base.entity.Company;
 import com.jpsoft.picc.modules.base.entity.CompanyMember;
+import com.jpsoft.picc.modules.base.entity.CompanyUser;
 import com.jpsoft.picc.modules.base.entity.Jobs;
 import com.jpsoft.picc.modules.base.service.CompanyMemberService;
 import com.jpsoft.picc.modules.base.service.CompanyService;
+import com.jpsoft.picc.modules.base.service.CompanyUserService;
 import com.jpsoft.picc.modules.base.service.JobsService;
 import com.jpsoft.picc.modules.business.entity.InsurancePolicy;
 import com.jpsoft.picc.modules.business.service.InsurancePolicyService;
@@ -64,12 +66,27 @@ public class CompanyMemberController {
     @Autowired
     private OSSConfig ossConfig;
 
+    @Autowired
+    private CompanyUserService companyUserService;
+
+    private Company findCompanyByUserName(String userName){
+        CompanyUser companyUser = companyUserService.findByUserName(userName);
+        Company company = null;
+
+        if (companyUser!=null && StringUtils.isNotEmpty(companyUser.getCompanyId())) {
+            company = companyService.get(companyUser.getCompanyId());
+        }
+
+        return company;
+    }
+
     @ApiOperation(value="读取企业人员列表")
     @RequestMapping(value = "list",method = RequestMethod.POST)
     public MessageResult<List<CompanyMember>> list(
                                    HttpServletRequest request){
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
-        Company company = companyService.findByCreateBy(principal.getName());
+//        Company company = companyService.findByCreateBy(principal.getName());
+        Company company = findCompanyByUserName(principal.getName());
 
         MessageResult<List<CompanyMember>> msgResult = new MessageResult<>();
 
@@ -115,7 +132,8 @@ public class CompanyMemberController {
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
-        Company company = companyService.findByCreateBy(principal.getName());
+//        Company company = companyService.findByCreateBy(principal.getName());
+        Company company = findCompanyByUserName(principal.getName());
 
         MessageResult<Map> msgResult = new MessageResult<>();
 
@@ -183,7 +201,8 @@ public class CompanyMemberController {
                                             @RequestParam(value="cardFiles",defaultValue="") String cardFiles,
                                             HttpServletRequest request){
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
-        Company company = companyService.findByCreateBy(principal.getName());
+//        Company company = companyService.findByCreateBy(principal.getName());
+        Company company = findCompanyByUserName(principal.getName());
 
         MessageResult<CompanyMember> msgResult = new MessageResult<>();
         CompanyMember companyMember = new CompanyMember();
@@ -200,15 +219,15 @@ public class CompanyMemberController {
                 msgResult.setMessage("该身份证已经注册");
             }else {
                 companyMember.setId(UUID.randomUUID().toString());
-                if (StringUtils.isNotEmpty(company.getId())) companyMember.setCompanyId(company.getId());
-                if (StringUtils.isNotEmpty(name)) companyMember.setName(name);
-                if (StringUtils.isNotEmpty(cardType)) companyMember.setCardType(cardType);
-                if (StringUtils.isNotEmpty(cardNo)) companyMember.setCardNo(cardNo);
-                if (sex != null) companyMember.setSex(sex);
-                if (age != 0) companyMember.setAge(age);
-                if (StringUtils.isNotEmpty(jobsId)) companyMember.setJobsId(jobsId);
-                if (StringUtils.isNotEmpty(healthStatus)) companyMember.setHealthStatus(healthStatus);
-                if (StringUtils.isNotEmpty(cardFiles)) companyMember.setCardFiles(cardFiles);
+                if (StringUtils.isNotEmpty(company.getId())){ companyMember.setCompanyId(company.getId());}
+                if (StringUtils.isNotEmpty(name)){ companyMember.setName(name);}
+                if (StringUtils.isNotEmpty(cardType)){  companyMember.setCardType(cardType);}
+                if (StringUtils.isNotEmpty(cardNo)){  companyMember.setCardNo(cardNo);}
+                if (sex != null){  companyMember.setSex(sex);}
+                if (age != 0){  companyMember.setAge(age);}
+                if (StringUtils.isNotEmpty(jobsId)){  companyMember.setJobsId(jobsId);}
+                if (StringUtils.isNotEmpty(healthStatus)){  companyMember.setHealthStatus(healthStatus);}
+                if (StringUtils.isNotEmpty(cardFiles)){  companyMember.setCardFiles(cardFiles);}
 
                 CheckIdCard cic = new CheckIdCard(cardNo);
 
@@ -302,15 +321,15 @@ public class CompanyMemberController {
         try {
             CompanyMember companyMember = companyMemberService.get(id);
 
-            if(StringUtils.isNotEmpty(company.getId())) companyMember.setCompanyId(company.getId());
-            if(StringUtils.isNotEmpty(name)) companyMember.setName(name);
-            if(StringUtils.isNotEmpty(cardType)) companyMember.setCardType(cardType);
-            if(StringUtils.isNotEmpty(cardNo)) companyMember.setCardNo(cardNo);
-            if(sex != null) companyMember.setSex(sex);
-            if(age != 0) companyMember.setAge(age);
-            if(StringUtils.isNotEmpty(jobsId)) companyMember.setJobsId(jobsId);
-            if(StringUtils.isNotEmpty(healthStatus)) companyMember.setHealthStatus(healthStatus);
-            if(StringUtils.isNotEmpty(cardFiles)) companyMember.setCardFiles(cardFiles);
+            if(StringUtils.isNotEmpty(company.getId())){ companyMember.setCompanyId(company.getId());}
+            if(StringUtils.isNotEmpty(name)){ companyMember.setName(name);}
+            if(StringUtils.isNotEmpty(cardType)){ companyMember.setCardType(cardType);}
+            if(StringUtils.isNotEmpty(cardNo)){ companyMember.setCardNo(cardNo);}
+            if(sex != null){ companyMember.setSex(sex);}
+            if(age != 0){ companyMember.setAge(age);}
+            if(StringUtils.isNotEmpty(jobsId)){ companyMember.setJobsId(jobsId);}
+            if(StringUtils.isNotEmpty(healthStatus)){ companyMember.setHealthStatus(healthStatus);}
+            if(StringUtils.isNotEmpty(cardFiles)){ companyMember.setCardFiles(cardFiles);}
 
             CheckIdCard cic = new CheckIdCard(cardNo);
 
@@ -388,7 +407,8 @@ public class CompanyMemberController {
                                            MultipartFile uploadFile,
                                            HttpServletRequest request){
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
-        Company company = companyService.findByCreateBy(principal.getName());
+//        Company company = companyService.findByCreateBy(principal.getName());
+        Company company = findCompanyByUserName(principal.getName());
 
         MessageResult<String> msgResult = new MessageResult<>();
         CompanyMember companyMember = new CompanyMember();
@@ -432,8 +452,8 @@ public class CompanyMemberController {
                         continue;
                     } else {
                         companyMember.setId(UUID.randomUUID().toString());
-                        if (StringUtils.isNotEmpty(company.getId())) companyMember.setCompanyId(company.getId());
-                        if (StringUtils.isNotEmpty(name)) companyMember.setName(name);
+                        if (StringUtils.isNotEmpty(company.getId())){ companyMember.setCompanyId(company.getId());}
+                        if (StringUtils.isNotEmpty(name)){ companyMember.setName(name);}
 
                         CheckIdCard cic = null;
 
@@ -510,7 +530,7 @@ public class CompanyMemberController {
                             companyMember.setJobsId(jobsList.get(0).getId());
                         }
 
-                        if (StringUtils.isNotEmpty(healthStatus)) companyMember.setHealthStatus(healthStatus);
+                        if (StringUtils.isNotEmpty(healthStatus)){ companyMember.setHealthStatus(healthStatus);}
 
                         companyMember.setStatus("0");
                         companyMember.setDelFlag(false);

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/InsuranceApplicationController.java

@@ -637,7 +637,7 @@ public class InsuranceApplicationController {
                 //记录状态变更
                 InsurancePolicyRecord insurancePolicyRecord = new InsurancePolicyRecord();
                 insurancePolicyRecord.setPolicyId(insurancePolicy.getId());
-                insurancePolicyRecord.setStatus(status + "");
+                insurancePolicyRecord.setStatus(insuranceApplication.getStatusN());
                 insurancePolicyRecord.setProcessStatus("正常");
                 insurancePolicyRecord.setOpinion("状态由" + insuranceApplication.getStatusN() + "变更为" + destStatus.getText());
                 insurancePolicyRecord.setId(UUID.randomUUID().toString());

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/InsurancePolicyUserController.java

@@ -4,8 +4,10 @@ import cn.hutool.core.convert.Convert;
 import com.github.pagehelper.Page;
 import com.jpsoft.picc.modules.base.entity.Company;
 import com.jpsoft.picc.modules.base.entity.CompanyMember;
+import com.jpsoft.picc.modules.base.entity.CompanyUser;
 import com.jpsoft.picc.modules.base.service.CompanyMemberService;
 import com.jpsoft.picc.modules.base.service.CompanyService;
+import com.jpsoft.picc.modules.base.service.CompanyUserService;
 import com.jpsoft.picc.modules.business.entity.ApplicationPolicy;
 import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
 import com.jpsoft.picc.modules.business.entity.InsurancePolicy;
@@ -60,6 +62,20 @@ public class InsurancePolicyUserController {
     @Autowired
     private InsurancePolicyService insurancePolicyService;
 
+    @Autowired
+    private CompanyUserService companyUserService;
+
+    private Company findCompanyByUserName(String userName){
+        CompanyUser companyUser = companyUserService.findByUserName(userName);
+        Company company = null;
+
+        if (companyUser!=null && StringUtils.isNotEmpty(companyUser.getCompanyId())) {
+            company = companyService.get(companyUser.getCompanyId());
+        }
+
+        return company;
+    }
+
     @ApiOperation(value="读取每月参保人员分页列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     @ApiImplicitParams({
@@ -135,7 +151,8 @@ public class InsurancePolicyUserController {
 
         try {
             AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
-            Company company = companyService.findByCreateBy(principal.getName());
+//            Company company = companyService.findByCreateBy(principal.getName());
+            Company company =  findCompanyByUserName(principal.getName());
 
             InsurancePolicy insurancePolicy = insurancePolicyService.get(policyId);
 
@@ -182,7 +199,8 @@ public class InsurancePolicyUserController {
                                                     @RequestParam(value="memberIds",defaultValue="") String memberIds,
                                                     HttpServletRequest request){
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
-        Company company = companyService.findByCreateBy(principal.getName());
+//        Company company = companyService.findByCreateBy(principal.getName());
+        Company company =  findCompanyByUserName(principal.getName());
 
         MessageResult<String> msgResult = new MessageResult<>();
 
@@ -250,6 +268,14 @@ public class InsurancePolicyUserController {
             int affectCount = insurancePolicyMemberService.update(insurancePolicyMember);
 
             if (affectCount > 0) {
+                String policyId = insurancePolicyMember.getPolicyId();
+                InsurancePolicy insurancePolicy = insurancePolicyService.get(policyId);
+
+                if(insurancePolicy!=null) {
+                    //更新投保人数及金额
+                    insurancePolicyService.updatePolicyNumAndAmount(insurancePolicy, null);
+                }
+
                 msgResult.setResult(true);
                 msgResult.setData(affectCount);
             } else {
@@ -278,7 +304,8 @@ public class InsurancePolicyUserController {
                                             MultipartFile uploadFile,
                                             HttpServletRequest request){
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
-        Company company = companyService.findByCreateBy(principal.getName());
+//        Company company = companyService.findByCreateBy(principal.getName());
+        Company company =  findCompanyByUserName(principal.getName());
 
         MessageResult<String> msgResult = new MessageResult<>();
         CompanyMember companyMember = new CompanyMember();
@@ -314,18 +341,18 @@ public class InsurancePolicyUserController {
                     companyMember = page.get(0);
                 }else{
                     companyMember.setId(UUID.randomUUID().toString());
-                    if(StringUtils.isNotEmpty(company.getId())) companyMember.setCompanyId(company.getId());
-                    if (StringUtils.isNotEmpty(name)) companyMember.setName(name);
-                    if (StringUtils.isNotEmpty(cardType)) companyMember.setCardType(cardType);
-                    if (StringUtils.isNotEmpty(cardNo)) companyMember.setCardNo(cardNo);
+                    if(StringUtils.isNotEmpty(company.getId())){ companyMember.setCompanyId(company.getId());}
+                    if (StringUtils.isNotEmpty(name)){ companyMember.setName(name);}
+                    if (StringUtils.isNotEmpty(cardType)){ companyMember.setCardType(cardType);}
+                    if (StringUtils.isNotEmpty(cardNo)){ companyMember.setCardNo(cardNo);}
                     if(sex.contains("男")){
                         companyMember.setSex(false);
                     }else {
                         companyMember.setSex(true);
                     }
-                    if (age != 0) companyMember.setAge(age);
-                    if (StringUtils.isNotEmpty(jobsId)) companyMember.setJobsId(jobsId);
-                    if (StringUtils.isNotEmpty(healthStatus)) companyMember.setHealthStatus(healthStatus);
+                    if (age != 0){ companyMember.setAge(age);}
+                    if (StringUtils.isNotEmpty(jobsId)){ companyMember.setJobsId(jobsId);}
+                    if (StringUtils.isNotEmpty(healthStatus)){ companyMember.setHealthStatus(healthStatus);}
 //                if(StringUtils.isNotEmpty(cardFiles)) companyMember.setCardFiles(cardFiles);
                     companyMember.setStatus("0");
                     companyMember.setDelFlag(false);
@@ -343,7 +370,7 @@ public class InsurancePolicyUserController {
                 if(page1.size() <= 0) {
                     InsurancePolicyMember insurancePolicyMember = new InsurancePolicyMember();
                     insurancePolicyMember.setId(UUID.randomUUID().toString());
-                    if (StringUtils.isNotEmpty(policyId)) insurancePolicyMember.setPolicyId(policyId);
+                    if (StringUtils.isNotEmpty(policyId)){ insurancePolicyMember.setPolicyId(policyId);}
                     insurancePolicyMember.setMemberId(companyMember.getId());
                     insurancePolicyMember.setStatus("0");
                     insurancePolicyMember.setDelFlag(false);
@@ -384,7 +411,8 @@ public class InsurancePolicyUserController {
     public MessageResult<String> replace(String policyMemberId,String srcMemberId,String destMemberId,
                                      HttpServletRequest request){
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
-        Company company = companyService.findByCreateBy(principal.getName());
+//        Company company = companyService.findByCreateBy(principal.getName());
+//        Company company =  findCompanyByUserName(principal.getName());
 
         MessageResult<String> msgResult = new MessageResult<>();
 

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/controller/UserController.java

@@ -291,7 +291,7 @@ public class UserController {
                     companyUser.setDelFlag(false);
                     companyUser.setCreateTime(new Date());
 
-                    //修复历史数据
+                    //修复历史数据->关联用户及单位
                     Company company = companyService.findByCreateBy(userName);
 
                     if (company!=null){

picc-enterprise-server/src/main/resources/application-production.yml

@@ -34,7 +34,7 @@ jpcloud:
   findMemberByNamesUrl: ${jpcloud.apiUrl}/api/member/v1/findMemberByNamesForPicc
   findMemberUrl: ${jpcloud.apiUrl}/api/member/v1/findMemberForPicc
   payUrl: ${jpcloud.apiUrl}/payment/tradingOrderPayPc
-  sellerSerialNumber: '000101000142'
+  sellerSerialNumber: '000002015987'
   platformCode: '0008'
   platformKey: '1234567890'