解决测试后台问题

common/src/main/java/com/jpsoft/employment/modules/base/entity/NewsInfo.java

@@ -54,6 +54,8 @@ public class NewsInfo {
 	@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
 
+	@ApiModelProperty(value = "审核状态")
+	private String status;
 
 	@Transient
 	@ApiModelProperty(value = "类型翻译")

common/src/main/resources/mapper/base/NewsInfo.xml

@@ -15,6 +15,7 @@
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
+			<result property="status" column="status_" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.NewsInfo">
 	<!--
@@ -24,7 +25,7 @@
 	-->
 	<![CDATA[
 		insert into base_news_info
-	    (id_,title_,category_,content,browse_number,thumbnail_image,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,title_,category_,content,browse_number,thumbnail_image,create_by,create_time,update_by,update_time,del_flag,status_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -38,6 +39,7 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
+,#{status,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -77,6 +79,9 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
+			<if test="status!=null">
+				status_=#{status,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

common/src/main/resources/mapper/base/TrainingPerson.xml

@@ -77,11 +77,19 @@ id_,person_id,training_id,create_by,create_time,update_by,update_time,del_flag
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="TrainingPersonMap">
 		<![CDATA[
-			select * from base_training_person
+			select a.* from base_training_person a
+			inner join base_person_info b on a.person_id = b.id_
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			a.del_flag = false
+			<if test="searchParams.trainingId != null">
+				and a.training_id = #{searchParams.trainingId}
+			</if>
+			<if test="searchParams.name != null">
+				and b.real_name like #{searchParams.name}
+			</if>
+			<if test="searchParams.phone != null">
+				and b.phone_ like #{searchParams.phone}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

web/src/main/java/com/jpsoft/employment/modules/base/controller/NewsInfoController.java

@@ -236,4 +236,36 @@ public class NewsInfoController {
 
         return msgResult;
     }
+
+
+    @ApiOperation(value="审核信息")
+    @PostMapping("check/{id}")
+    public MessageResult<NewsInfo> check(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<NewsInfo> msgResult = new MessageResult<>();
+
+        try {
+
+            NewsInfo newsInfo = newsInfoService.get(id);
+            newsInfo.setStatus("1");
+            newsInfo.setUpdateBy(subject);
+            newsInfo.setUpdateTime(new Date());
+
+            int affectCount = newsInfoService.update(newsInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库审核失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

web/src/main/java/com/jpsoft/employment/modules/base/controller/RecruitInformationInfoController.java

@@ -58,6 +58,8 @@ public class RecruitInformationInfoController {
 			recruitInformationInfo.setDelFlag(false);
             recruitInformationInfo.setCreateBy(subject);
             recruitInformationInfo.setCreateTime(new Date());
+            recruitInformationInfo.setStatus("0");
+            recruitInformationInfo.setBrowseNumber(0);
 
             int affectCount = recruitInformationInfoService.insert(recruitInformationInfo);
 
@@ -273,4 +275,36 @@ public class RecruitInformationInfoController {
 
         return msgResult;
     }
+
+
+    @ApiOperation(value="审核信息")
+    @PostMapping("check/{id}")
+    public MessageResult<RecruitInformationInfo> check(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<RecruitInformationInfo> msgResult = new MessageResult<>();
+
+        try {
+
+            RecruitInformationInfo recruitInformationInfo = recruitInformationInfoService.get(id);
+            recruitInformationInfo.setStatus("1");
+            recruitInformationInfo.setUpdateBy(subject);
+            recruitInformationInfo.setUpdateTime(new Date());
+
+            int affectCount = recruitInformationInfoService.update(recruitInformationInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库审核失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

web/src/main/java/com/jpsoft/employment/modules/base/controller/TrainingInfoController.java

@@ -54,6 +54,7 @@ public class TrainingInfoController {
 			trainingInfo.setDelFlag(false);
             trainingInfo.setCreateBy(subject);
             trainingInfo.setCreateTime(new Date());
+            trainingInfo.setStatus("0");
 
             int affectCount = trainingInfoService.insert(trainingInfo);
 

web/src/main/java/com/jpsoft/employment/modules/base/controller/TrainingPersonController.java

@@ -200,7 +200,7 @@ public class TrainingPersonController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            String trainingId,String name,String phone,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -216,8 +216,16 @@ public class TrainingPersonController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(trainingId)) {
+            searchParams.put("trainingId",trainingId);
+        }
+
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name", name + "%");
+        }
+
+        if (StringUtils.isNotEmpty(phone)) {
+            searchParams.put("phone", phone + "%");
         }