1.营业性质显示修改。

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

@@ -14,6 +14,8 @@ import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
 import com.jpsoft.picc.modules.business.service.InsuranceApplicationService;
+import com.jpsoft.picc.modules.sys.entity.DataDictionary;
+import com.jpsoft.picc.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -26,6 +28,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.xml.crypto.Data;
 import java.math.BigDecimal;
 import java.util.*;
 
@@ -62,6 +65,9 @@ public class InsuranceApplicationController {
     @Autowired
     private CompanyService companyService;
 
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
     public MessageResult<InsuranceApplication> create(){
@@ -149,6 +155,12 @@ public class InsuranceApplicationController {
                 //首月投保
                 insuranceApplication.setInsurancePolicy(insurancePolicy);
 
+                //营业性质
+//                if (StringUtils.isNotEmpty(insuranceApplication.getBusinessNature())){
+//                    String businessNatureName = dataDictionaryService.findNameByCatalogNameAndValue("营业性质",insuranceApplication.getBusinessNature());
+//                    insuranceApplication.setBusinessNatureN(businessNatureName);
+//                }
+
                 msgResult.setResult(true);
                 msgResult.setData(insuranceApplication);
             } else {

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

@@ -13,6 +13,7 @@ import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.utils.NumberToCN;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.utils.WeixinUtil;
+import com.jpsoft.picc.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -74,6 +75,9 @@ public class InsurancePolicyController {
     @Autowired
     private InsuranceDefinitionService insuranceDefinitionService;
 
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
     public MessageResult<InsurancePolicy> create(){
@@ -724,7 +728,28 @@ public class InsurancePolicyController {
         destPolicy.setEndTime(startTime.plusMonths(1).toDate());
 
         //下月状态为待初审
-        destPolicy.setStatus(PolicyStatus.PendingTrial.getValue() + "");
+//        destPolicy.setStatus(PolicyStatus.PendingTrial.getValue() + "");
+        List<InsurancePolicyMember> insurancePolicyMemberList = insurancePolicyMemberService.findByPolicyId(srcPolicy.getId());
+
+        boolean isUnChecked = false;
+
+        for (InsurancePolicyMember insurancePolicyMember:insurancePolicyMemberList) {
+            String memberStatus = insurancePolicyMember.getStatus();
+            //花名册人员是否为已复核状态
+            if(!("2").equals(memberStatus)){
+                isUnChecked = true;
+                break;
+            }
+        }
+
+        if(isUnChecked){
+            //有未复核人员
+            destPolicy.setStatus(PolicyStatus.PendingTrial.getValue() + "");
+        }
+        else{
+            //所有人员都已复核
+            destPolicy.setStatus(PolicyStatus.PendingMakePolicy.getValue() + "");
+        }
 
         destPolicy.setEffectiveDate(startTime.toString("yyyyMM"));
 
@@ -889,6 +914,12 @@ public class InsurancePolicyController {
 
                 insuranceApplication.setInsurancePolicy(insurancePolicy);
 
+                //营业性质
+//                if (StringUtils.isNotEmpty(insuranceApplication.getBusinessNature())){
+//                    String businessNatureName = dataDictionaryService.findNameByCatalogNameAndValue("营业性质",insuranceApplication.getBusinessNature());
+//                    insuranceApplication.setBusinessNatureN(businessNatureName);
+//                }
+
                 msgResult.setResult(true);
                 msgResult.setData(insuranceApplication);
             } else {

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

@@ -256,7 +256,8 @@ public class InsurancePolicyMemberController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","desc"));
+        sortList.add(new Sort("status_","asc"));
+        sortList.add(new Sort("create_time","asc"));
 
         if (StringUtils.isNotEmpty(policyId)) {
             searchParams.put("policyId",policyId);

picc-admin-server/src/main/java/com/jpsoft/picc/modules/sys/controller/MenuController.java

@@ -198,7 +198,7 @@ public class MenuController {
         Map<String, Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time", "asc"));
+        sortList.add(new Sort("a.sort_no", "asc"));
 
         if (StringUtils.isNotEmpty(keywords)) {
             searchParams.put("menuName", "%" + keywords + "%");

picc-admin-server/src/main/java/com/jpsoft/picc/scheduled/FissionWantedTask.java

@@ -10,6 +10,8 @@ import com.jpsoft.picc.modules.business.service.InsurancePolicyMemberService;
 import com.jpsoft.picc.modules.business.service.InsurancePolicyService;
 import com.jpsoft.picc.modules.common.constant.PolicyStatus;
 import lombok.extern.apachecommons.CommonsLog;
+import lombok.extern.slf4j.Slf4j;
+import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,12 +26,8 @@ import java.util.List;
 
 @Component
 @Configuration
-@EnableScheduling
-@CommonsLog
+@Slf4j
 public class FissionWantedTask {
-
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
     @Autowired
     private InsurancePolicyService insurancePolicyService;
 
@@ -39,38 +37,22 @@ public class FissionWantedTask {
     @Autowired
     private InsuranceDefinitionService insuranceDefinitionService;
 
-    @Scheduled(cron="0 0 3 * * ?")
+    //每10分钟执行一次
+    @Scheduled(cron="0 0/1 * * * ?")
     public void staticCronTask() {
         editInsurancePolicy();
     }
 
-
     private void editInsurancePolicy(){
-
-        Calendar cal = Calendar.getInstance();
-
-        //获取当前年份
-        String year = String.valueOf(cal.get(Calendar.YEAR));
-
-        //获取下一月为几月
-        String month = String.valueOf(cal.get(Calendar.MONTH) + 2);
-
-        //获取当前日
-        String day = String.valueOf(cal.get(Calendar.DATE));
-
-        //待初审状态
-        String status = String.valueOf(PolicyStatus.PendingTrial.getValue());
-
-        //待制单状态
-        String status1 = String.valueOf(PolicyStatus.PendingMakePolicy.getValue());
-
-        String nextYearMonth = year + month;
+        String nextYearMonth = DateTime.now().plusMonths(1).toString("yyyyMM");
+        String day = String.valueOf(DateTime.now().dayOfMonth().get());
 
         //获取待调整下月投保单
-        List<InsurancePolicy> insurancePolicyList = insurancePolicyService.toBeAdjustedPolicy(nextYearMonth,status);
+        List<InsurancePolicy> insurancePolicyList = insurancePolicyService.toBeAdjustedPolicy(nextYearMonth,PolicyStatus.Draft.getValue() + "");
 
-        for (InsurancePolicy insurancePolicy :insurancePolicyList) {
+        int affectCount = 0;
 
+        for (InsurancePolicy insurancePolicy :insurancePolicyList) {
             String id = insurancePolicy.getId();
 
             InsuranceDefinition insuranceDefinition = insuranceDefinitionService.get(insurancePolicy.getDefinitionId());
@@ -87,25 +69,24 @@ public class FissionWantedTask {
                 for (InsurancePolicyMember insurancePolicyMember:insurancePolicyMemberList) {
                     String memberStatus = insurancePolicyMember.getStatus();
                     //花名册人员是否为已复核状态
-                    if(!memberStatus.equals("2")){
+                    if(!("2").equals(memberStatus)){
                         isUnChecked = true;
                         break;
                     }
                 }
 
                 if(isUnChecked){
-                    insurancePolicy.setStatus(status);
+                    insurancePolicy.setStatus(PolicyStatus.PendingTrial.getValue() + "");
                 }
                 else{
-                    insurancePolicy.setStatus(status1);
+                    insurancePolicy.setStatus(PolicyStatus.PendingMakePolicy.getValue() + "");
                 }
+
                 insurancePolicyService.update(insurancePolicy);
+                affectCount++;
             }
         }
 
-        logger.info(nextYearMonth + "已完成修改状态");
-
+        log.warn(nextYearMonth + "已自动修改状态:" + affectCount + "条记录");
     }
-
-
 }

picc-admin-server/src/test/java/com/jpsoft/picc/test/PolicyTest.java

@@ -2,6 +2,7 @@ package com.jpsoft.picc.test;
 
 import com.jpsoft.picc.modules.business.entity.InsurancePolicy;
 import com.jpsoft.picc.modules.business.service.InsurancePolicyService;
+import com.jpsoft.picc.modules.sys.service.DataDictionaryService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +22,9 @@ public class PolicyTest {
     @Autowired
     private InsurancePolicyService insurancePolicyService;
 
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
     @Transactional(rollbackFor=Exception.class,propagation=Propagation.REQUIRED)
     public void transactionMethod(){
         InsurancePolicy policy = insurancePolicyService.get("78e7de89-d903-41e5-9b5d-73205baed84a");
@@ -42,4 +46,9 @@ public class PolicyTest {
             System.out.println(ex.getMessage());
         }
     }
+
+    @Test
+    public void test2(){
+        dataDictionaryService.findNameByCatalogNameAndValue("123","4565");
+    }
 }

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

@@ -37,7 +37,9 @@ public class InsuranceApplication {
 	private String businessScope;
 	@ApiModelProperty(value = "营业性质")
 	private String businessNature;
-    @ApiModelProperty(value = "行业类型")
+	@ApiModelProperty(value = "营业性质描述")
+	private String businessNatureN;
+	@ApiModelProperty(value = "行业类型")
 	private String industryType;
     @ApiModelProperty(value = "联系电话")
 	private String tel;
@@ -465,4 +467,12 @@ public class InsuranceApplication {
 	public void setInsurancePolicy(InsurancePolicy insurancePolicy) {
 		this.insurancePolicy = insurancePolicy;
 	}
+
+	public String getBusinessNatureN() {
+		return businessNatureN;
+	}
+
+	public void setBusinessNatureN(String businessNatureN) {
+		this.businessNatureN = businessNatureN;
+	}
 }

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

@@ -23,4 +23,6 @@ public interface DataDictionaryDAO {
 	List<DataDictionary> search(Map<String, Object> searchParams, List<Sort> sortList);
 
     List<DataDictionary> findByCatalogName(String catalogName);
+
+    String findNameByCatalogNameAndValue(String catalogName,String value);
 }

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

@@ -20,4 +20,5 @@ public interface DataDictionaryService {
 	List<Map<String, Object>> queryChildren(String parentId);
 	Page<DataDictionary> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
     List<DataDictionary> findByCatalogName(String catalogName);
+    String findNameByCatalogNameAndValue(String catalogName,String value);
 }

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

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -91,4 +92,13 @@ public class DataDictionaryServiceImpl implements DataDictionaryService {
 	public List<DataDictionary> findByCatalogName(String catalogName) {
 		return dataDictionaryDAO.findByCatalogName(catalogName);
 	}
+
+	@Override
+	public String findNameByCatalogNameAndValue(String catalogName,String value) {
+//		Map<String,Object> map = new HashMap<>();
+//		map.put("catalogName",catalogName);
+//		map.put("value",value);
+
+		return dataDictionaryDAO.findNameByCatalogNameAndValue(catalogName,value);
+	}
 }

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

@@ -135,8 +135,10 @@
 		and b.del_flag=0 and no_ = 1
 		order by b.create_time asc limit 1
 	</select>
-	<select id="findApplicationByPolicyId" resultMap="com.jpsoft.picc.modules.business.dao.InsuranceApplicationDAO.InsuranceApplicationMap">
-		SELECT b.* FROM business_application_policy a,business_insurance_application b
+	<select id="findApplicationByPolicyId" resultMap="com.jpsoft.picc.modules.business.dao.InsuranceApplicationDAO.InsuranceApplicationMap2">
+		SELECT b.*,
+		'营业性质' as 'business_nature_catalog'
+		FROM business_application_policy a,business_insurance_application b
 		where a.policy_id=#{0}
 		and a.application_id = b.id_
 		and b.del_flag=0

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

@@ -32,6 +32,12 @@
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
     </resultMap>
+    <resultMap id="InsuranceApplicationMap2" extends="InsuranceApplicationMap" type="com.jpsoft.picc.modules.business.entity.InsuranceApplication">
+        <association property="businessNatureN"
+                     column="{catalogName=business_nature_catalog,value=business_nature}"
+                     select="com.jpsoft.picc.modules.sys.dao.DataDictionaryDAO.findNameByCatalogNameAndValue"
+        />
+    </resultMap>
     <insert id="insert" parameterType="com.jpsoft.picc.modules.business.entity.InsuranceApplication">
         <!--
         <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
@@ -157,8 +163,8 @@
         </set>
         where id_=#{id}
     </update>
-	<select id="get" parameterType="string" resultMap="InsuranceApplicationMap">
-        select * from (
+	<select id="get" parameterType="string" resultMap="InsuranceApplicationMap2">
+        select *,'营业性质' as 'business_nature_catalog' from (
         select t1.*,t2.name_ as definition_name
         from business_insurance_application t1
         left join base_insurance_definition t2 on t1.definition_id = t2.id_

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

@@ -228,8 +228,9 @@
     </select>
     <select id="toBeAdjustedPolicy" resultMap="InsurancePolicyMap">
         select * from business_insurance_policy
-        where del_flag = false
-        and effective_date = #{effective_date}
+        where del_flag = 0
+        and no_>1
+        and effective_date = #{effectiveDate}
         and status_ = #{status}
     </select>
 </mapper>

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

@@ -163,4 +163,13 @@
         and a.del_flag = 0
         order by a.sort_no asc
     </select>
+    <select id="findNameByCatalogNameAndValue" parameterType="map" resultType="string">
+        select a.name_
+        from sys_data_dictionary a,sys_data_dictionary b
+        where a.parent_id =b.id_ and b.name_=#{catalogName}
+        and a.del_flag = 0
+        and a.value_=#{value}
+        order by a.sort_no asc
+        limit 1
+    </select>
 </mapper>

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

@@ -17,6 +17,7 @@ import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.utils.SignUtil;
+import com.jpsoft.picc.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -81,6 +82,9 @@ public class InsuranceApplicationController {
     @Autowired
     private CompanyUserService companyUserService;
 
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
     @ApiOperation(value="投保单列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     @ApiImplicitParams({
@@ -181,6 +185,12 @@ public class InsuranceApplicationController {
                 PojoUtils.map(insuranceApplication, insuranceApplicationDTO);
                 insuranceApplicationDTO.setApplicationId(insuranceApplication.getId());
 
+                //营业性质
+//                if (StringUtils.isNotEmpty(insuranceApplication.getBusinessNature())){
+//                    String businessNatureName = dataDictionaryService.findNameByCatalogNameAndValue("营业性质",insuranceApplication.getBusinessNature());
+//                    insuranceApplicationDTO.setBusinessNatureN(businessNatureName);
+//                }
+
                 DateTime endTime = new DateTime(insuranceApplication.getEndTime());
                 DateTime startTime = new DateTime(insuranceApplication.getStartTime());
 

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

@@ -14,6 +14,7 @@ import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.sys.entity.User;
+import com.jpsoft.picc.modules.sys.service.DataDictionaryService;
 import com.jpsoft.picc.modules.sys.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -78,6 +79,9 @@ public class InsurancePolicyController {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
     @ResponseBody
     @ApiOperation(value="附件列表")
     @RequestMapping(value = "attachmentList",method = RequestMethod.GET)
@@ -373,6 +377,12 @@ public class InsurancePolicyController {
                 PojoUtils.map(insuranceApplication, insuranceApplicationDTO);
                 insuranceApplicationDTO.setApplicationId(insuranceApplication.getId());
 
+                //营业性质
+//                if (StringUtils.isNotEmpty(insuranceApplication.getBusinessNature())){
+//                    String businessNatureName = dataDictionaryService.findNameByCatalogNameAndValue("营业性质",insuranceApplication.getBusinessNature());
+//                    insuranceApplicationDTO.setBusinessNatureN(businessNatureName);
+//                }
+
                 DateTime endTime = new DateTime(insuranceApplication.getEndTime());
                 DateTime startTime = new DateTime(insuranceApplication.getStartTime());
 
@@ -482,17 +492,32 @@ public class InsurancePolicyController {
             @ApiImplicitParam(name = "policyId",value = "投保单编号", required = true, paramType = "form"),
             @ApiImplicitParam(name = "status",value = "状态:草稿10/已退回15/待初审20/待复审30/待缴费40/待制单50/待出单60/已出单70/已过期100", required = true, paramType = "form"),
     })
-    public MessageResult<String> changeStatus(String policyId,String status){
+    public MessageResult<String> changeStatus(String policyId,String status,HttpServletRequest request){
+        AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
+
         MessageResult<String> messageResult = new MessageResult<>();
 
         try {
             //todo
             InsurancePolicy insurancePolicy = insurancePolicyService.get(policyId);
             insurancePolicy.setStatus(status);
+            insurancePolicy.setUpdateBy(principal.getName());
             insurancePolicy.setUpdateTime(new Date());
 
             insurancePolicyService.update(insurancePolicy);
 
+            if (insurancePolicy.getNo().equals(1)){
+                 List<InsuranceApplication> applicationList = applicationPolicyService.findApplicationByPolicyId(insurancePolicy.getId());
+
+                for (InsuranceApplication insuranceApplication: applicationList) {
+                    insuranceApplication.setStatus(status);
+                    insuranceApplication.setUpdateBy(principal.getName());
+                    insurancePolicy.setUpdateTime(new Date());
+
+                    insuranceApplicationService.update(insuranceApplication);
+                }
+            }
+
             messageResult.setResult(true);
         }
         catch (Exception ex){

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/dto/InsuranceApplicationDTO.java

@@ -26,6 +26,8 @@ public class InsuranceApplicationDTO {
     private String companyName;
     @ApiModelProperty(value = "营业性质")
     private String businessNature;
+    @ApiModelProperty(value = "营业性质名称")
+    private String businessNatureN;
     @ApiModelProperty(value = "组织机构代码证")
     private String usccCode;
     @ApiModelProperty(value = "营业范围")