Merge remote-tracking branch 'origin/master'

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

@@ -36,6 +36,8 @@ public class InsuranceDefinition {
 	private String updateBy;
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
+	@ApiModelProperty(value = "每月截止时间")
+	private String cutOffTime;
     private List<InsuranceDefinitionLimit> limits;
 
     /**
@@ -185,4 +187,21 @@ public class InsuranceDefinition {
 	public void setLimits(List<InsuranceDefinitionLimit> id){
 		this.limits = limits;
 	}
+
+
+	/**
+	 *获取截止时间
+	 */
+	public String getCutOffTime(){
+		return cutOffTime;
+	}
+
+	/**
+	 *设置截止时间
+	 */
+	public void setCutOffTime(String cutOffTime){
+		this.cutOffTime = cutOffTime;
+	}
+
+
 }

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

@@ -140,6 +140,9 @@
 			<if test="searchParams.delFlag != null">
 				and del_flag = #{searchParams.delFlag}
 			</if>
+			<if test="searchParams.cardNo != null">
+				and card_no = #{searchParams.cardNo}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

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

@@ -14,6 +14,7 @@
 			<result property="createTime" column="create_time" />
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
+			<result property="cutOffTime" column="cut_off_time" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.picc.modules.base.entity.InsuranceDefinition">
 	<!--
@@ -23,7 +24,7 @@
 	-->
 	<![CDATA[
 		insert into base_insurance_definition
-	    (id_,name_,insurance_description,clause_,status_,del_flag,create_by,create_time,update_by,update_time)
+	    (id_,name_,insurance_description,clause_,status_,del_flag,create_by,create_time,update_by,update_time,cut_off_time)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -36,6 +37,7 @@
 ,#{createTime,jdbcType= TIMESTAMP }
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
+,#{cutOffTime,jdbcType= VARCHAR }
 		)
 	]]>
 	</insert>
@@ -70,14 +72,17 @@
 		update_by=#{updateBy,jdbcType=VARCHAR},
 		</if>
 				<if test="updateTime!=null">
-		update_time=#{updateTime,jdbcType= TIMESTAMP },
+			update_time=#{updateTime,jdbcType= TIMESTAMP },
 		</if>
+			<if test="cutOffTime!=null">
+				cut_off_time=#{cutOffTime,jdbcType= VARCHAR },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="InsuranceDefinitionMap">
 		select 
-id_,name_,insurance_description,clause_,status_,del_flag,create_by,create_time,update_by,update_time		from base_insurance_definition where id_=#{0}
+id_,name_,insurance_description,clause_,status_,del_flag,create_by,create_time,update_by,update_time,cut_off_time		from base_insurance_definition where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_insurance_definition where id_=#{0}

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

@@ -159,29 +159,39 @@ public class CompanyMemberController {
         CompanyMember companyMember = new CompanyMember();
 
         try {
-            companyMember.setId(UUID.randomUUID().toString());
-            if(StringUtils.isNotEmpty(company.getId())) companyMember.setCompanyId(company.getId());
-            if(StringUtils.isNotEmpty(name)) companyMember.setName(name);
-            if(StringUtils.isNotEmpty(cardType)) companyMember.setCardType(cardType);
-            if(StringUtils.isNotEmpty(cardNo)) companyMember.setCardNo(cardNo);
-            if(sex != null) companyMember.setSex(sex);
-            if(age != 0) companyMember.setAge(age);
-            if(StringUtils.isNotEmpty(jobsId)) companyMember.setJobsId(jobsId);
-            if(StringUtils.isNotEmpty(healthStatus)) companyMember.setHealthStatus(healthStatus);
-            if(StringUtils.isNotEmpty(cardFiles)) companyMember.setCardFiles(cardFiles);
+            Map<String,Object> searchParams = new HashMap<>();
+            searchParams.put("companyId",company.getId());
+            searchParams.put("cardNo",cardNo);
+            List<Sort> sortList = new ArrayList<>();
+            Page<CompanyMember> page = companyMemberService.pageSearch(searchParams,1,100,sortList);
+            if(page.size() > 0){
+                msgResult.setResult(false);
+                msgResult.setMessage("该条数据已存在");
+            }else {
+                companyMember.setId(UUID.randomUUID().toString());
+                if (StringUtils.isNotEmpty(company.getId())) companyMember.setCompanyId(company.getId());
+                if (StringUtils.isNotEmpty(name)) companyMember.setName(name);
+                if (StringUtils.isNotEmpty(cardType)) companyMember.setCardType(cardType);
+                if (StringUtils.isNotEmpty(cardNo)) companyMember.setCardNo(cardNo);
+                if (sex != null) companyMember.setSex(sex);
+                if (age != 0) companyMember.setAge(age);
+                if (StringUtils.isNotEmpty(jobsId)) companyMember.setJobsId(jobsId);
+                if (StringUtils.isNotEmpty(healthStatus)) companyMember.setHealthStatus(healthStatus);
+                if (StringUtils.isNotEmpty(cardFiles)) companyMember.setCardFiles(cardFiles);
 //            if(StringUtils.isNotEmpty(status)) companyMember.setStatus(status);
-            companyMember.setDelFlag(false);
-            companyMember.setCreateBy(principal.getName());
-            companyMember.setCreateTime(new Date());
+                companyMember.setDelFlag(false);
+                companyMember.setCreateBy(principal.getName());
+                companyMember.setCreateTime(new Date());
 
-            int affectCount = companyMemberService.insert(companyMember);
+                int affectCount = companyMemberService.insert(companyMember);
 
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(companyMember);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
+                if (affectCount > 0) {
+                    msgResult.setResult(true);
+                    msgResult.setData(companyMember);
+                } else {
+                    msgResult.setResult(false);
+                    msgResult.setMessage("数据库添加失败");
+                }
             }
         }
         catch(Exception ex){
@@ -346,39 +356,54 @@ public class CompanyMemberController {
             list.remove(0);
 
             int affectCount = 0;
+            int existCount = 0;
             for(Object[] array : list){
                 String name = array[1].toString();
                 String cardType = array[2].toString();
                 String cardNo = array[3].toString();
-                Boolean sex = Convert.toBool(array[4]);
+                String sex = array[4].toString();
                 int age = Convert.toInt(array[5]);
                 String jobsId = array[6].toString();
                 String healthStatus = array[7].toString();
 
-                companyMember.setId(UUID.randomUUID().toString());
-                if(StringUtils.isNotEmpty(company.getId())) companyMember.setCompanyId(company.getId());
-                if(StringUtils.isNotEmpty(name)) companyMember.setName(name);
-                if(StringUtils.isNotEmpty(cardType)) companyMember.setCardType(cardType);
-                if(StringUtils.isNotEmpty(cardNo)) companyMember.setCardNo(cardNo);
-                if(sex != null) companyMember.setSex(sex);
-                if(age != 0) companyMember.setAge(age);
-                if(StringUtils.isNotEmpty(jobsId)) companyMember.setJobsId(jobsId);
-                if(StringUtils.isNotEmpty(healthStatus)) companyMember.setHealthStatus(healthStatus);
+                Map<String,Object> searchParams = new HashMap<>();
+                searchParams.put("companyId",company.getId());
+                searchParams.put("cardNo",cardNo);
+                List<Sort> sortList = new ArrayList<>();
+                Page<CompanyMember> page = companyMemberService.pageSearch(searchParams,1,100,sortList);
+
+                if(page.size() > 0) {
+                    existCount++;
+                }else {
+                    companyMember.setId(UUID.randomUUID().toString());
+                    if (StringUtils.isNotEmpty(company.getId())) companyMember.setCompanyId(company.getId());
+                    if (StringUtils.isNotEmpty(name)) companyMember.setName(name);
+                    if (StringUtils.isNotEmpty(cardType)) companyMember.setCardType(cardType);
+                    if (StringUtils.isNotEmpty(cardNo)) companyMember.setCardNo(cardNo);
+                    if (sex.contains("男")) {
+                        companyMember.setSex(false);
+                    } else {
+                        companyMember.setSex(true);
+                    }
+                    if (age != 0) companyMember.setAge(age);
+                    if (StringUtils.isNotEmpty(jobsId)) companyMember.setJobsId(jobsId);
+                    if (StringUtils.isNotEmpty(healthStatus)) companyMember.setHealthStatus(healthStatus);
 //                if(StringUtils.isNotEmpty(cardFiles)) companyMember.setCardFiles(cardFiles);
-                companyMember.setStatus("0");
-                companyMember.setDelFlag(false);
-                companyMember.setCreateBy(principal.getName());
-                companyMember.setCreateTime(new Date());
-
-                if(companyMemberService.insert(companyMember) > 0) {
-                    affectCount++;
+                    companyMember.setStatus("0");
+                    companyMember.setDelFlag(false);
+                    companyMember.setCreateBy(principal.getName());
+                    companyMember.setCreateTime(new Date());
+
+                    if (companyMemberService.insert(companyMember) > 0) {
+                        affectCount++;
+                    }
                 }
             }
 
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
-                msgResult.setData("成功导入" + affectCount + "条记录。");
+                msgResult.setData("有" + existCount + "条记录已存在，成功导入" + affectCount + "条记录。");
             } else {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库添加失败");

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

@@ -267,19 +267,18 @@ public class InsurancePolicyUserController {
                 String name = array[1].toString();
                 String cardType = array[2].toString();
                 String cardNo = array[3].toString();
-                Boolean sex = Convert.toBool(array[4]);
+                String sex = array[4].toString();
                 int age = Convert.toInt(array[5]);
                 String jobsId = array[6].toString();
                 String healthStatus = array[7].toString();
 
                 Map<String,Object> searchParams = new HashMap<>();
                 searchParams.put("companyId",company.getId());
-                searchParams.put("name",name);
                 searchParams.put("cardNo",cardNo);
                 List<Sort> sortList = new ArrayList<>();
                 Page<CompanyMember> page = companyMemberService.pageSearch(searchParams,1,100,sortList);
 
-                if(page.size() == 1) {
+                if(page.size() > 0) {
                     companyMember = page.get(0);
                 }else{
                     companyMember.setId(UUID.randomUUID().toString());
@@ -287,7 +286,11 @@ public class InsurancePolicyUserController {
                     if (StringUtils.isNotEmpty(name)) companyMember.setName(name);
                     if (StringUtils.isNotEmpty(cardType)) companyMember.setCardType(cardType);
                     if (StringUtils.isNotEmpty(cardNo)) companyMember.setCardNo(cardNo);
-                    if (sex != null) companyMember.setSex(sex);
+                    if(sex.contains("男")){
+                        companyMember.setSex(false);
+                    }else {
+                        companyMember.setSex(true);
+                    }
                     if (age != 0) companyMember.setAge(age);
                     if (StringUtils.isNotEmpty(jobsId)) companyMember.setJobsId(jobsId);
                     if (StringUtils.isNotEmpty(healthStatus)) companyMember.setHealthStatus(healthStatus);
@@ -296,6 +299,7 @@ public class InsurancePolicyUserController {
                     companyMember.setDelFlag(false);
                     companyMember.setCreateBy(principal.getName());
                     companyMember.setCreateTime(new Date());
+                    companyMemberService.insert(companyMember);
                 }
 
                 InsurancePolicyMember insurancePolicyMember = new InsurancePolicyMember();