保险代理人接口修改参数优化实体类

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

@@ -353,6 +353,11 @@ public class InsurancePolicyController {
 
         int affectCount = approval(applicationId,policyId,processStatus,opinion,status ,subject);
 
+        if(affectCount > 0){
+            //修改花名册人员状态为初审
+            check(policyId,"1",subject);
+        }
+
         msgResult.setResult(true);
         msgResult.setData(affectCount);
 
@@ -400,6 +405,11 @@ public class InsurancePolicyController {
 
         int affectCount = approval(applicationId,policyId,processStatus,opinion,status ,subject);
 
+        if(affectCount > 0){
+            //修改花名册人员状态为初审
+            check(policyId,"2",subject);
+        }
+
         msgResult.setResult(true);
         msgResult.setData(affectCount);
 
@@ -673,4 +683,17 @@ public class InsurancePolicyController {
             insurancePolicyMemberService.insert(destMember);
         }
     }
+
+    private void check(String policyId,String status,String subject){
+        List<InsurancePolicyMember> insurancePolicyMemberList = insurancePolicyMemberService.findByPolicyId(policyId);
+        for (InsurancePolicyMember insurancePolicyMember:insurancePolicyMemberList) {
+            String statusMember = insurancePolicyMember.getStatus();
+            if(StringUtils.isEmpty(statusMember)){
+                insurancePolicyMember.setStatus(status);
+                insurancePolicyMember.setUpdateBy(subject);
+                insurancePolicyMember.setUpdateTime(new Date());
+                insurancePolicyMemberService.update(insurancePolicyMember);
+            }
+        }
+    }
 }

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

@@ -195,6 +195,48 @@ public class InsurancePolicyMemberController {
         return msgResult;
     }
 
+
+
+    @ApiOperation(value="批量审批")
+    @PostMapping("batchCheck")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="status",value = "状态",required = true,paramType = "query")
+    })
+    public MessageResult<Integer> batchCheck(@RequestBody List<String> idList,String status,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                InsurancePolicyMember insurancePolicyMember = insurancePolicyMemberService.get(id);
+                //状态改为初审
+                insurancePolicyMember.setStatus(status);
+                insurancePolicyMember.setUpdateBy(subject);
+                insurancePolicyMember.setUpdateTime(new Date());
+
+                affectCount += insurancePolicyMemberService.update(insurancePolicyMember);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("审核失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     @ApiImplicitParams({

picc-common/src/main/java/com/jpsoft/picc/modules/base/entity/InsuranceAgent.java

@@ -4,11 +4,18 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+
+import com.jpsoft.picc.modules.sys.dao.DataDictionaryDAO;
+import com.jpsoft.picc.modules.sys.entity.DataDictionary;
+import com.jpsoft.picc.modules.sys.service.DataDictionaryService;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModel;
 
+import javax.annotation.Resource;
+
 /**
   描述:base_insurance_agent的实体类
  */
@@ -20,6 +27,10 @@ public class InsuranceAgent {
 	private String name;
     @ApiModelProperty(value = "审核状态")
 	private String status;
+	@ApiModelProperty(value = "保险代理人类型")
+	private String type;
+	@ApiModelProperty(value = "保险代理人类型（翻译）")
+	private String typeN;
     @ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
     @ApiModelProperty(value = "创建人")
@@ -31,6 +42,9 @@ public class InsuranceAgent {
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
+	@Resource(name="dataDictionaryDAO")
+	private DataDictionaryDAO dataDictionaryDAO;
+
     /**
 	 *获取编号
 	 */
@@ -73,6 +87,34 @@ public class InsuranceAgent {
 		this.status = status;
 	}
 
+	/**
+	 *获取保险代理人类型
+	 */
+	public String getType(){
+		return type;
+	}
+
+	/**
+	 *设置险代理人类型
+	 */
+	public void setType(String type){
+		this.type = type;
+	}
+
+	/**
+	 *获取保险代理人类型
+	 */
+	public String getTypeN(){
+		return typeN;
+	}
+
+	/**
+	 *设置险代理人类型
+	 */
+	public void setTypeN(String typeN){
+		this.typeN = typeN;
+	}
+
 	/**
 	 *获取是否删除
 	 */

picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/InsurancePolicy.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
 
+import com.jpsoft.picc.modules.base.entity.InsuranceAgent;
 import com.jpsoft.picc.modules.common.constant.PolicyStatus;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -47,6 +48,8 @@ public class InsurancePolicy {
     private Date transferTime;
     @ApiModelProperty(value = "保险代理人")
     private String agentId;
+    @ApiModelProperty(value = "保险代理人")
+    private InsuranceAgent agent;
     @ApiModelProperty(value = "投保单附件")
     private String insurancePolicyFile;
     @ApiModelProperty(value = "当前第几份")
@@ -226,6 +229,20 @@ public class InsurancePolicy {
     public void setAgentId(String agentId){
         this.agentId = agentId;
     }
+
+    /**
+     *获取保险代理人
+     */
+    public InsuranceAgent getAgent(){
+        return agent;
+    }
+
+    /**
+     *设置保险代理人
+     */
+    public void setAgent(InsuranceAgent agent){
+        this.agent = agent;
+    }
     /**
      *获取投保单附件
      */

picc-common/src/main/java/com/jpsoft/picc/modules/sys/dao/DataDictionaryDAO.java

@@ -18,6 +18,7 @@ public interface DataDictionaryDAO {
 	String getName(String id);
 	String getValue(String id);
 	List<DataDictionary> list();
+	String findParentId(String parentId,String value);
 	List<Map<String, Object>> queryChildren(String parentId);
 	List<DataDictionary> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/sys/service/DataDictionaryService.java

@@ -16,6 +16,7 @@ public interface DataDictionaryService {
 	String getName(String id);
 	String getValue(String id);
 	List<DataDictionary> list();
+	String findParentId(String parentId,String value);
 	List<Map<String, Object>> queryChildren(String parentId);
 	Page<DataDictionary> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/sys/service/impl/DataDictionaryServiceImpl.java

@@ -61,6 +61,11 @@ public class DataDictionaryServiceImpl implements DataDictionaryService {
 	public String getValue(String id){
 		return dataDictionaryDAO.getValue(id);
 	}
+
+	@Override
+	public String findParentId(String parentId,String value){
+		return dataDictionaryDAO.findParentId(parentId,value);
+	}
 	
 	@Override
 	public List<DataDictionary> list() {

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

@@ -7,6 +7,7 @@
 		<id property="id" column="id_" />
 			<result property="name" column="name_" />
 			<result property="status" column="status_" />
+			<result property="type" column="type_" />
 			<result property="delFlag" column="del_flag" />
 			<result property="createBy" column="create_by" />
 			<result property="createTime" column="create_time" />
@@ -21,12 +22,13 @@
 	-->
 	<![CDATA[
 		insert into base_insurance_agent
-	    (id_,name_,status_,del_flag,create_by,create_time,update_by,update_time)
+	    (id_,name_,status_,type_,del_flag,create_by,create_time,update_by,update_time)
 		values
 		(
 #{id,jdbcType=VARCHAR}
 ,#{name,jdbcType=VARCHAR}
 ,#{status,jdbcType=VARCHAR}
+,#{type,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{createBy,jdbcType=VARCHAR}
 ,#{createTime,jdbcType= TIMESTAMP }
@@ -45,8 +47,11 @@
 		name_=#{name,jdbcType=VARCHAR},
 		</if>
 				<if test="status!=null">
-		status_=#{status,jdbcType=VARCHAR},
+			status_=#{status,jdbcType=VARCHAR},
 		</if>
+			<if test="type!=null">
+				type_=#{type,jdbcType=VARCHAR},
+			</if>
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
@@ -67,7 +72,7 @@
 	</update>
 	<select id="get" parameterType="string" resultMap="InsuranceAgentMap">
 		select 
-id_,name_,status_,del_flag,create_by,create_time,update_by,update_time		from base_insurance_agent where id_=#{0}
+id_,name_,status_,type_,del_flag,create_by,create_time,update_by,update_time		from base_insurance_agent where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_insurance_agent where id_=#{0} and del_flag = false

picc-common/src/main/resources/mapper/business/InsurancePolicy.xml

@@ -26,6 +26,7 @@
         <result property="createTime" column="create_time" />
         <result property="updateBy" column="update_by" />
         <result property="updateTime" column="update_time" />
+        <association property="agent" column="agent_id" select="com.jpsoft.picc.modules.base.dao.InsuranceAgentDAO.get"></association>
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.picc.modules.business.entity.InsurancePolicy">
         <!--

picc-common/src/main/resources/mapper/sys/DataDictionary.xml

@@ -147,4 +147,10 @@
 		from sys_data_dictionary a
 		where a.id_=#{0} and a.del_flag = 0
 	</select>
+
+	<select id="findParentId" parameterType="string" resultType="string">
+		select a.name_ as userName
+		from sys_data_dictionary a
+		where a.parent_id =#{parentId} and a.value_=#{0} and a.del_flag = 0
+	</select>
 </mapper>