1.管理后台相关实体类、DAO、service移到picc-common模块中。

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

@@ -112,9 +112,9 @@
 		where t1.del_flag=0 and t1.policy_id=#{policyId}
 		and t1.member_id=t2.id_ and t2.jobs_id = #{jobsId}
 	</select>
-	<select id="findByPolicyId" resultMap="InsurancePolicyMemberMap">
+	<select id="findByPolicyId" parameterType="string" resultMap="InsurancePolicyMemberMap">
 		select * from business_insurance_policy_member
-		where del_flag = false and policy_id=#{0}
+		where del_flag = false and policy_id=#{policyId}
 		order by create_time asc
 	</select>
 </mapper>

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

@@ -14,6 +14,8 @@ 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.entity.User;
+import com.jpsoft.picc.modules.sys.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -74,6 +76,9 @@ public class InsurancePolicyController {
     @Autowired
     private JobsService jobsService;
 
+    @Autowired
+    private UserService userService;
+
     @ApiOperation(value="查看附件")
     @RequestMapping(value = "attachmentList",method = RequestMethod.POST)
     @ApiImplicitParams({
@@ -121,8 +126,14 @@ public class InsurancePolicyController {
         if(page.size() > 0){
             InsurancePolicyRecordDTO insurancePolicyRecordDTO = new InsurancePolicyRecordDTO();
             PojoUtils.map(page.getResult().get(0), insurancePolicyRecordDTO);
-            Company company = companyService.get(insurancePolicyRecordDTO.getCreateBy());
-            insurancePolicyRecordDTO.setCreateByName(company.getName());
+
+//          Company company = companyService.get(insurancePolicyRecordDTO.getCreateBy());
+//          insurancePolicyRecordDTO.setCreateByName(company.getName());
+            User user = userService.get(insurancePolicyRecordDTO.getCreateBy());
+
+            if(user!=null){
+                insurancePolicyRecordDTO.setCreateByName(user.getRealName());
+            }
 
             msgResult.setResult(true);
             msgResult.setData(insurancePolicyRecordDTO);

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

@@ -21,8 +21,10 @@ public class InsurancePolicyRecordDTO {
     private Boolean delFlag;
     private String createBy;
     private String createByName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
     private String updateBy;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date updateTime;
     @ApiModelProperty(value = "状态:待制单50/待出单60/已出单70")
     private String status;

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

@@ -51,6 +51,7 @@ public class UserController {
             String serviceTicketUrl = getTGT(casServerTicketUrl, userName, password, service);
 
             if (StringUtils.isEmpty(serviceTicketUrl)) {
+                msgResult.setMessage("用户名或密码错误!");
                 msgResult.setResult(false);
             } else {
                 Map<String, Object> dataMap = new HashMap<>();
@@ -86,7 +87,7 @@ public class UserController {
         }
         catch (Exception ex){
             msgResult.setResult(false);
-            msgResult.setMessage("用户名或密码错误!" + ex.getMessage());
+            msgResult.setMessage( ex.getMessage());
         }
 
         return  msgResult;