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

cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanTraining.java

@@ -51,14 +51,14 @@ public class PlanTraining implements Serializable {
 	@ApiModelProperty("考核人")
 	private String assessment;
 
-	@ApiModelProperty("培训地点")
-	private String place;
+//	@ApiModelProperty("培训地点")
+//	private String place;
 
 	@ApiModelProperty("考核要求")
 	private String requirement;
 
-	@ApiModelProperty("联系电话")
-	private String phone;
+//	@ApiModelProperty("联系电话")
+//	private String phone;
 
 	@ApiModelProperty("开始时间")
 	private LocalDate startTime;

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/PlanTrainingQuery.java

@@ -36,14 +36,14 @@ public class PlanTrainingQuery {
 	@ApiModelProperty("考核人")
 	private String assessment;
 
-	@ApiModelProperty("培训地点")
-	private String place;
+//	@ApiModelProperty("培训地点")
+//	private String place;
 
 	@ApiModelProperty("考核要求")
 	private String requirement;
 
-	@ApiModelProperty("联系电话")
-	private String phone;
+//	@ApiModelProperty("联系电话")
+//	private String phone;
 
 	@ApiModelProperty("开始时间")
 	private LocalDate startTime;

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

@@ -32,6 +32,9 @@ public class NonStandardApprovalVo {
 	@ApiModelProperty("审批工日")
 	private Double approvalHours;
 
+	@ApiModelProperty("工作描述")
+	private String workDescription;
+
 	@ApiModelProperty("状态 0:未提交 1:待审批 2:已通过 3：未通过")
 	private Integer status;
 

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

@@ -34,14 +34,14 @@ public class PlanTrainingVo {
 	@ApiModelProperty("考核人")
 	private String assessment;
 
-	@ApiModelProperty("培训地点")
-	private String place;
+//	@ApiModelProperty("培训地点")
+//	private String place;
 
 	@ApiModelProperty("考核要求")
 	private String requirement;
 
-	@ApiModelProperty("联系电话")
-	private String phone;
+//	@ApiModelProperty("联系电话")
+//	private String phone;
 
 	@ApiModelProperty("开始时间")
 	private LocalDate startTime;

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

@@ -283,7 +283,7 @@ public class PlanTrainingServiceImpl extends ServiceImpl<PlanTrainingMapper, Pla
 					userIds=userIds.equals("")?byId.getWxId():userIds+"|"+byId.getWxId();
 				}
 			}
-				String content="您好！您有一项新的培训计划，记得按时前往"+planTraining2.getPlace()+"参加";
+				String content="您好！您有一项新的培训计划，记得按时参加";
 //				System.out.println("**************************content**********************");
 //				System.out.println(content);
 //				System.out.println(userIds);