1.修改团队预约修改逻辑

cjy-project/src/main/java/com/cjy/appointmentteamdata/domain/AppointmentPeopleInfo.java

@@ -54,6 +54,17 @@ public class AppointmentPeopleInfo extends BaseEntity {
 	private String documentsNumber;
 	private String encryptionDocumentsNumber;
 
+
+	private String dataState;
+
+	public String getDataState() {
+		return dataState;
+	}
+
+	public void setDataState(String dataState) {
+		this.dataState = dataState;
+	}
+
 	public String getEncryptionDocumentsNumber() {
 		return encryptionDocumentsNumber;
 	}

cjy-project/src/main/java/com/cjy/appointmentteamdata/mapper/AppointmentPeopleInfoMapper.java

@@ -43,6 +43,8 @@ public interface AppointmentPeopleInfoMapper
      * @return
      */
     public int insertAppointmentPeopleInfoList(@Param("list") List<AppointmentPeopleInfo> appointmentPeopleInfo,@Param("id") Long id);
+
+    public int updateAppointmentPeopleInfoList(@Param("list") List<AppointmentPeopleInfo> appointmentPeopleInfo);
     /**
      * 修改预约团队人员信息
      * 

cjy-project/src/main/java/com/cjy/appointmentteamdata/service/IAppointmentPeopleInfoService.java

@@ -43,6 +43,7 @@ public interface IAppointmentPeopleInfoService
      * @return
      */
     public int insertAppointmentPeopleInfoList(List<AppointmentPeopleInfo> appointmentPeopleInfo,Long id);
+    public int updateAppointmentPeopleInfoList(List<AppointmentPeopleInfo> appointmentPeopleInfo);
 
     /**
      * 修改预约团队人员信息

cjy-project/src/main/java/com/cjy/appointmentteamdata/service/impl/AppointmentPeopleInfoServiceImpl.java

@@ -67,6 +67,11 @@ public class AppointmentPeopleInfoServiceImpl implements IAppointmentPeopleInfoS
         return appointmentPeopleInfoMapper.insertAppointmentPeopleInfoList(appointmentPeopleInfo,id);
     }
 
+    @Override
+    public int updateAppointmentPeopleInfoList(List<AppointmentPeopleInfo> appointmentPeopleInfo) {
+        return appointmentPeopleInfoMapper.updateAppointmentPeopleInfoList(appointmentPeopleInfo);
+    }
+
     /**
      * 修改预约团队人员信息
      * 

cjy-project/src/main/java/com/cjy/appointmentteamdata/service/impl/AppointmentTeamDataServiceImpl.java

@@ -40,6 +40,7 @@ public class AppointmentTeamDataServiceImpl implements IAppointmentTeamDataServi
 	IAppointmentPeopleInfoService iAppointmentPeopleInfoService;
 	@Value("${weibo.encryptionRule}")
 	private String rule;
+
 	/**
 	 * 查询预约团队数据
 	 *
@@ -48,7 +49,7 @@ public class AppointmentTeamDataServiceImpl implements IAppointmentTeamDataServi
 	 */
 	@Override
 	public AppointmentTeamData selectAppointmentTeamDataById(Long id) {
-		AppointmentTeamData appointmentTeamData=appointmentTeamDataMapper.selectAppointmentTeamDataById(id);
+		AppointmentTeamData appointmentTeamData = appointmentTeamDataMapper.selectAppointmentTeamDataById(id);
 
 		appointmentTeamData.setNewList(iAppointmentPeopleInfoService.selectAllAppointmentPeopleInfo(id));
 
@@ -80,7 +81,7 @@ public class AppointmentTeamDataServiceImpl implements IAppointmentTeamDataServi
 		Long id = idWorker.nextId();
 		appointmentTeamData.setId(id);
 		appointmentTeamDataMapper.insertAppointmentTeamData(appointmentTeamData);
-		appointmentTeamData.getNewList().stream().forEach(item->{
+		appointmentTeamData.getNewList().stream().forEach(item -> {
 			item.setEncryptionDocumentsNumber(WeiBoEncryption.encrypt(item.getDocumentsNumber(), rule));
 		});
 		iAppointmentPeopleInfoService.insertAppointmentPeopleInfoList(appointmentTeamData.getNewList(), id);
@@ -151,12 +152,23 @@ public class AppointmentTeamDataServiceImpl implements IAppointmentTeamDataServi
 		appointmentTeamData.setUpdateTime(DateUtils.getNowDate());
 		appointmentTeamDataMapper.updateAppointmentTeamData(appointmentTeamData);
 		//第一部先删除该预约单的数据
-		iAppointmentPeopleInfoService.deleteAppointmentPeopleInfoByAppointmentForm(appointmentTeamData.getId());
+//		iAppointmentPeopleInfoService.deleteAppointmentPeopleInfoByAppointmentForm(appointmentTeamData.getId());
+
 		//插入新预约单的数据
-		 appointmentTeamData.getNewList().stream().forEach(item->{
-			 item.setEncryptionDocumentsNumber(WeiBoEncryption.encrypt(item.getDocumentsNumber(), rule));
+		appointmentTeamData.getNewList().stream().forEach(item -> {
+			item.setEncryptionDocumentsNumber(WeiBoEncryption.encrypt(item.getDocumentsNumber(), rule));
 		});
-		iAppointmentPeopleInfoService.insertAppointmentPeopleInfoList( appointmentTeamData.getNewList(),appointmentTeamData.getId());
+
+		List<AppointmentPeopleInfo> addList = appointmentTeamData.getNewList().stream().filter(i -> i.getDataState().equals("a")).collect(Collectors.toList());
+		if (!addList.isEmpty()) {
+			iAppointmentPeopleInfoService.insertAppointmentPeopleInfoList(addList, appointmentTeamData.getId());
+		}
+
+		List<AppointmentPeopleInfo> updateList = appointmentTeamData.getNewList().stream().filter(i -> i.getDataState().equals("u")).collect(Collectors.toList());
+		if (!updateList.isEmpty()) {
+			//批量修改
+			iAppointmentPeopleInfoService.updateAppointmentPeopleInfoList(updateList);
+		}
 		return 1;
 	}
 
@@ -171,7 +183,7 @@ public class AppointmentTeamDataServiceImpl implements IAppointmentTeamDataServi
 	public int deleteAppointmentTeamDataByIds(Long[] ids) {
 		appointmentTeamDataMapper.deleteAppointmentTeamDataByIds(ids);
 		iAppointmentPeopleInfoService.deleteAppointmentPeopleInfoByAppointmentDate(ids);
-		return  1;
+		return 1;
 	}
 
 	/**

cjy-project/src/main/resources/mapper/appointmentteamdata/AppointmentPeopleInfoMapper.xml

@@ -66,7 +66,8 @@
                update_by,
                update_time
         from appointment_people_info
-        where  appointment_form=#{id}   and del_flag!=2
+        where appointment_form = #{id}
+          and del_flag!=2
     </select>
 
     <insert id="insertAppointmentPeopleInfo" parameterType="AppointmentPeopleInfo" useGeneratedKeys="true"
@@ -128,7 +129,9 @@
     </update>
 
     <update id="deleteAppointmentPeopleInfoById" parameterType="Long">
-        update appointment_people_info set del_flag = '2' where id = #{id}
+        update appointment_people_info
+        set del_flag = '2'
+        where id = #{id}
     </update>
 
     <update id="deleteAppointmentPeopleInfoByIds" parameterType="String">
@@ -139,7 +142,10 @@
     </update>
 
     <delete id="deleteAppointmentPeopleInfoByAppointmentForm">
-        delete  from appointment_people_info  where appointment_form =#{appointmentForm} and  del_flag != '2'
+        delete
+        from appointment_people_info
+        where appointment_form = #{appointmentForm}
+          and del_flag != '2'
     </delete>
     <update id="deleteAppointmentPeopleInfoByAppointmentDate">
 
@@ -148,4 +154,26 @@
             #{id}
         </foreach>
     </update>
+    <update id="updateAppointmentPeopleInfoList">
+        <foreach collection="list" item="item" index="index" separator=";">
+            update appointment_people_info
+            <trim prefix="SET" suffixOverrides=",">
+                <if test="item.name != null and item.name != ''"> name = #{item.name},</if>
+                <if test="item.phone != null and item.phone != ''">phone = #{item.phone},</if>
+                <if test="item.certificateType != null and item.certificateType != ''">certificate_type =
+                    #{item.certificateType},
+                </if>
+                <if test="item.documentsNumber != null and item.documentsNumber != ''">documents_number =
+                    #{item.documentsNumber},
+                </if>
+                <if test="item.remark != null and item.remark != ''">remark = #{item.remark},</if>
+                <if test="item.createBy != null and item.createBy != ''">create_by = #{item.createBy},</if>
+                <if test="item.createTime != null">create_time = #{item.createTime},</if>
+                <if test="item.updateBy != null">update_by = #{item.updateBy},</if>
+                <if test="item.updateTime != null">update_time = #{item.updateTime},</if>
+                del_flag='1',
+            </trim>
+            where id = #{item.id}
+        </foreach>
+    </update>
 </mapper>