Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanPeopleMapper.xml

@@ -11,7 +11,7 @@
     </sql>
 
     <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.PlanPeopleVo">
-        select pp.id,pp.name,pp.account,pp.status,pp.alias
+        select pp.*
         from plan_people pp
         <include refid="where"/>
         order by pp.id asc

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanPeopleVo.java

@@ -24,4 +24,10 @@ public class PlanPeopleVo implements Serializable {
 
 	@ApiModelProperty("文件名")
 	private String alias;
+
+	@ApiModelProperty("扩展名")
+	private String extName;
+
+	@ApiModelProperty("附件地址")
+	private String enclosureUrl;
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanPeopleServiceImpl.java

@@ -124,17 +124,27 @@ public class PlanPeopleServiceImpl extends ServiceImpl<PlanPeopleMapper, PlanPeo
 	@Override
 	public BaseResponse synchronization(Integer id) {
 		PlanPeople planPeople = planPeopleMapper.selectById(id);
-		Integer planId = planPeople.getPlanId();
-		PlanTraining planTraining = planTrainingMapper.selectById(planId);
-		HistoryArchives historyArchives = new HistoryArchives();
-		historyArchives.setCreateTime(LocalDateTime.now())
-				.setTime(planTraining.getStartTime())
-				.setType(planTraining.getContent())
-				.setContent(planTraining.getObjective())
-				.setUserId(planPeople.getUserId());
+		if (planPeople!=null) {
+			Integer planId = planPeople.getPlanId();
+				PlanTraining planTraining = planTrainingMapper.selectById(planId);
+				if (planTraining!=null){
+				HistoryArchives historyArchives = new HistoryArchives();
+				historyArchives.setCreateTime(LocalDateTime.now())
+						.setTime(planTraining.getStartTime())
+						.setType(planTraining.getContent())
+						.setContent(planTraining.getObjective())
+						.setUserId(planPeople.getUserId());
 
-		historyArchivesMapper.insert(historyArchives);
+				historyArchivesMapper.insert(historyArchives);
 
-		return BaseResponse.okData("同步成功");
+				return BaseResponse.okData("同步成功");
+			}
+			else {
+				return BaseResponse.errorMsg("该数据不存在，请重新输入正确的数据");
+			}
+		}
+		else {
+			return BaseResponse.errorMsg("该数据不存在，请输入正确的数据");
+		}
 	}
 }