Merge remote-tracking branch 'origin/master'

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/CompanyController.java

@@ -2,6 +2,8 @@ package com.jpsoft.picc.modules.base.controller;
 
 import com.github.pagehelper.Page;
 import com.jpsoft.picc.modules.base.entity.Company;
+import com.jpsoft.picc.modules.base.entity.CompanyUser;
+import com.jpsoft.picc.modules.base.service.CompanyUserService;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
@@ -27,6 +29,9 @@ public class CompanyController {
     @Autowired
     private CompanyService companyService;
 
+    @Autowired
+    private CompanyUserService companyUserService;
+
     @ApiOperation(value="获取信息")
     @GetMapping("detail")
     @ApiImplicitParams({
@@ -198,4 +203,35 @@ public class CompanyController {
 
         return msgResult;
     }
+
+
+
+    @ApiOperation(value="获取企业人员信息")
+    @RequestMapping(value = "companyUserDetail",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId",value = "企业ID", required = true, paramType = "query")
+    })
+    public MessageResult<CompanyUser> companyUserDetail(String companyId){
+        MessageResult<CompanyUser> msgResult = new MessageResult<>();
+
+        try {
+            CompanyUser companyUser = companyUserService.findByCompanyId(companyId);
+
+            if (companyUser != null) {
+                msgResult.setResult(true);
+                msgResult.setData(companyUser);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceAgentController.java

@@ -229,11 +229,11 @@ public class InsuranceAgentController {
 
     @ApiOperation(value="所有代理人列表")
     @RequestMapping(value = "list",method = RequestMethod.POST)
-    public MessageResult<List<InsuranceAgent>> list(){
+    public MessageResult<List<InsuranceAgent>> list(String type){
 
         MessageResult<List<InsuranceAgent>> msgResult = new MessageResult<>();
 
-        List<InsuranceAgent> list = insuranceAgentService.list();
+        List<InsuranceAgent> list = insuranceAgentService.listByType(type);
 
         msgResult.setResult(true);
         msgResult.setData(list);

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/InsurancePolicyController.java

@@ -460,18 +460,23 @@ public class InsurancePolicyController {
         boolean flag = false;
         String msg = "";
 
-        if(affectCount > 0 && processStatus.equals("正常")){
-            //生成下月投保单
-            try {
-                generatePolicyInTrans(applicationId, policyId, subject);
-                flag = true;
+        if(affectCount > 0 ){
+            if(processStatus.equals("正常")) {
+                //生成下月投保单
+                try {
+                    generatePolicyInTrans(applicationId, policyId, subject);
+                    flag = true;
+                } catch (Exception ex) {
+                    flag = false;
+                    msg = ex.getMessage();
+                }
             }
-            catch (Exception ex){
-                flag = false;
-                msg = ex.getMessage();
+            else{
+                flag = true;
             }
         }
 
+
         msgResult.setResult(flag);
         msgResult.setData(affectCount);
         msgResult.setMessage(msg);
@@ -526,11 +531,12 @@ public class InsurancePolicyController {
             @ApiImplicitParam(name="issuingBank",value = "出账银行",required = true,paramType = "query"),
             @ApiImplicitParam(name="singlNumber",value = "单号",required = true,paramType = "query"),
             @ApiImplicitParam(name="processStatus",value = "流程审核状态（正常/回退）",required = true,paramType = "query"),
-            @ApiImplicitParam(name="opinion",value = "意见",required = true,paramType = "query")
+            @ApiImplicitParam(name="opinion",value = "意见",required = true,paramType = "query"),
+            @ApiImplicitParam(name="agentId",value = "保险代理人ID",required = true,paramType = "query")
     })
     public MessageResult<Integer> transfer(String applicationId,String policyId,
                                            String accountBank,String issuingBank,String singlNumber,
-                                           String processStatus,String opinion, @RequestAttribute String subject){
+                                           String processStatus,String opinion,String agentId, @RequestAttribute String subject){
 
         //当前用户ID
         System.out.println(subject);
@@ -554,6 +560,7 @@ public class InsurancePolicyController {
         item.setIssuingBank(issuingBank);
         item.setSinglNumber(singlNumber);
         item.setTransferTime(new Date());
+        item.setAgentId(agentId);
 
         int affectCount = insurancePolicyService.update(item);
 

picc-common/src/main/java/com/jpsoft/picc/modules/base/dao/CompanyUserDAO.java

@@ -17,4 +17,5 @@ public interface CompanyUserDAO {
 	List<CompanyUser> search(Map<String, Object> searchParams, List<Sort> sortList);
     CompanyUser findByUserName(String userName);
 	CompanyUser findByOpenId(String openId);
+	CompanyUser findByCompanyId(String companyId);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/base/dao/InsuranceAgentDAO.java

@@ -14,5 +14,6 @@ public interface InsuranceAgentDAO {
 	InsuranceAgent get(String id);
 	int delete(String id);
 	List<InsuranceAgent> list();
+	List<InsuranceAgent> listByType(String type);
 	List<InsuranceAgent> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

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

@@ -18,4 +18,6 @@ public interface CompanyUserService {
     CompanyUser findByUserName(String userName);
 
     CompanyUser findByOpenId(String openId);
+
+	CompanyUser findByCompanyId(String companyId);
 }

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

@@ -13,5 +13,6 @@ public interface InsuranceAgentService {
 	int update(InsuranceAgent model);
 	int delete(String id);
 	List<InsuranceAgent> list();
+	List<InsuranceAgent> listByType(String type);
 	Page<InsuranceAgent> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
 }

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

@@ -58,6 +58,7 @@ public class CompanyUserServiceImpl implements CompanyUserService {
 		// TODO Auto-generated method stub
 		return companyUserDAO.list();
 	}
+
 		
 	@Override
 	public Page<CompanyUser> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
@@ -77,4 +78,10 @@ public class CompanyUserServiceImpl implements CompanyUserService {
 	public CompanyUser findByOpenId(String openId) {
 		return companyUserDAO.findByOpenId(openId);
 	}
+
+
+	@Override
+	public CompanyUser findByCompanyId(String companyId) {
+		return companyUserDAO.findByCompanyId(companyId);
+	}
 }

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

@@ -58,6 +58,11 @@ public class InsuranceAgentServiceImpl implements InsuranceAgentService {
 		// TODO Auto-generated method stub
 		return insuranceAgentDAO.list();
 	}
+
+	@Override
+	public List<InsuranceAgent> listByType(String type){
+		return insuranceAgentDAO.listByType(type);
+	}
 		
 	@Override
 	public Page<InsuranceAgent> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {

picc-common/src/main/resources/mapper/base/CompanyUser.xml

@@ -130,4 +130,10 @@ id_,user_name,password_,phone_,open_id,profession_,summary_,company_id,status_,c
 		where open_id=#{0} and del_flag=0
 		order by create_time asc limit 1
 	</select>
+	<select id="findByCompanyId" resultMap="CompanyUserMap">
+		select *
+		from base_company_user
+		where company_id=#{0} and del_flag=0
+		order by create_time asc limit 1
+	</select>
 </mapper>

picc-common/src/main/resources/mapper/base/InsuranceAgent.xml

@@ -80,6 +80,9 @@ id_,name_,status_,type_,del_flag,create_by,create_time,update_by,update_time		fr
 	<select id="list" resultMap="InsuranceAgentMap">
 		select * from base_insurance_agent where del_flag = false
 	</select>
+	<select id="listByType" resultMap="InsuranceAgentMap">
+		select * from base_insurance_agent where del_flag = false and type_=#{0}
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="InsuranceAgentMap">
 		<![CDATA[
 			select * from base_insurance_agent