浏览代码

1.每月投保单分页查询接口修改,DAO层方法未正常返回导致bug。
2.日志配置完善。

tomatozq 5 年之前
父节点
当前提交
44600f2a89

+ 1 - 1
picc-common/src/main/java/com/jpsoft/picc/modules/business/dao/InsurancePolicyDAO.java

@@ -25,5 +25,5 @@ public interface InsurancePolicyDAO {
 
     long countByApplicationIdAndEffectiveDate(String applicationId, String effectiveDate);
 
-    void nextMonthPageList(Map<String, Object> searchParams, List<Sort> sortList);
+    List<InsurancePolicy> nextMonthPageList(Map<String, Object> searchParams, List<Sort> sortList);
 }

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

@@ -78,8 +78,8 @@ public class InsuranceApplicationController {
     @ApiImplicitParams({
         @ApiImplicitParam(name = "status",value = "状态:草稿10/已退回15/待初审20/待复审30/待缴费40/待制单50/待出单60/已出单70/已过期100", required = true, paramType = "form",dataType = "String"),
         @ApiImplicitParam(name = "definitionId",value = "险种编号", required = false, paramType = "form",dataType = "String"),
-        @ApiImplicitParam(name = "startTime",value = "险种编号", required = false, paramType = "form",dataType = "String"),
-        @ApiImplicitParam(name = "endTime",value = "险种编号", required = false, paramType = "form",dataType = "String"),
+        @ApiImplicitParam(name = "startTime",value = "起始时间", required = false, paramType = "form",dataType = "String"),
+        @ApiImplicitParam(name = "endTime",value = "结束时间", required = false, paramType = "form",dataType = "String"),
     })
     public MessageResult<Map> pageList(
             String status,String definitionId,

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

@@ -39,8 +39,6 @@ import java.util.*;
 @RestController
 @RequestMapping("/auth/insurancePolicy")
 public class InsurancePolicyController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-
     @Autowired
     private InsurancePolicyService insurancePolicyService;
 
@@ -91,7 +89,7 @@ public class InsurancePolicyController {
             }
         }
         catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+            log.error(ex.getMessage(),ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -184,8 +182,8 @@ public class InsurancePolicyController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "status",value = "状态:待调整10/已退回15/待初审20/待复审30/待制单50/待出单60/已出单70", required = true, paramType = "form",dataType = "String"),
             @ApiImplicitParam(name = "definitionId",value = "险种编号", required = false, paramType = "form",dataType = "String"),
-            @ApiImplicitParam(name = "startTime",value = "险种编号", required = false, paramType = "form",dataType = "String"),
-            @ApiImplicitParam(name = "endTime",value = "险种编号", required = false, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "startTime",value = "起始时间", required = false, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "endTime",value = "结束时间", required = false, paramType = "form",dataType = "String"),
     })
     public MessageResult<Map> pageList(
             String status,String definitionId,
@@ -194,12 +192,12 @@ public class InsurancePolicyController {
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
-        AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
-        Company company = companyService.findByCreateBy(principal.getName());
-
         MessageResult<Map> msgResult = new MessageResult<>();
 
         try {
+            AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
+            Company company = companyService.findByCreateBy(principal.getName());
+
             Map<String, Object> searchParams = new HashMap<>();
 
             List<Sort> sortList = new ArrayList<>();
@@ -231,7 +229,7 @@ public class InsurancePolicyController {
             msgResult.setResult(true);
         }
         catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+            log.error(ex.getMessage(),ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -286,7 +284,7 @@ public class InsurancePolicyController {
             msgResult.setResult(true);
         }
         catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+            log.error(ex.getMessage(),ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());

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

@@ -333,9 +333,9 @@ public class InsurancePolicyUserController {
     @ApiOperation(value="替换参保人员")
     @PostMapping("replace")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "policyMemberId",value = "参保人员主键", required = true, paramType = "form",dataType = "String"),
-            @ApiImplicitParam(name = "srcMemberId",value = "被替换的企业人员编号", required = true, paramType = "form",dataType = "String"),
-            @ApiImplicitParam(name = "destMemberId",value = "替换企业人员编号", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "policyMemberId",value = "参保人员主键", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "srcMemberId",value = "被替换企业人员表主键", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "destMemberId",value = "替换企业人员表主键", required = true, paramType = "form",dataType = "String"),
     })
     public MessageResult<String> replace(String policyMemberId,String srcMemberId,String destMemberId,
                                      HttpServletRequest request){

+ 6 - 0
picc-enterprise-server/src/main/resources/logback-spring.xml

@@ -34,6 +34,12 @@
             <appender-ref ref="STDOUT" />
         </logger>
     </springProfile>
+    <springProfile name="remote">
+        <root level="WARN">
+            <appender-ref ref="STDOUT" />
+            <appender-ref ref="FILE" />
+        </root>
+    </springProfile>
     <springProfile name="test">
         <root level="WARN">
             <appender-ref ref="STDOUT" />