Merge remote-tracking branch 'origin/master'

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

@@ -56,5 +56,10 @@ public class VolunteerTasks {
 	
 			@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
+
+
+	@ApiModelProperty(value = "是否上架")
+	private Boolean isShelves;
+
 	
 		}

common/src/main/resources/mapper/base/VolunteerTasks.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="isShelves" column="is_shelves" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.VolunteerTasks">
 	<!--
@@ -24,7 +25,7 @@
 	-->
 	<![CDATA[
 		insert into base_volunteer_tasks
-	    (id_,introduce_,volunteer_requirements,school_contact,start_time,end_time,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,introduce_,volunteer_requirements,school_contact,start_time,end_time,create_by,create_time,update_by,update_time,del_flag,is_shelves)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -38,6 +39,7 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
+,#{isShelves,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -77,6 +79,9 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
+			<if test="isShelves!=null">
+				is_shelves=#{isShelves,jdbcType= NUMERIC },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

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

@@ -49,6 +49,7 @@ public class VolunteerTasksController {
 			volunteerTasks.setDelFlag(false);
             volunteerTasks.setCreateBy(subject);
             volunteerTasks.setCreateTime(new Date());
+            volunteerTasks.setIsShelves(true);//默认上架
 
             int affectCount = volunteerTasksService.insert(volunteerTasks);
 
@@ -224,4 +225,35 @@ public class VolunteerTasksController {
 
         return msgResult;
     }
+
+
+    @ApiOperation(value="更改状态")
+    @PostMapping("changeStatus")
+    public MessageResult<VolunteerTasks> changeStatus(String id,boolean status,@RequestAttribute String subject){
+        MessageResult<VolunteerTasks> msgResult = new MessageResult<>();
+
+        try {
+            VolunteerTasks volunteerTasks = volunteerTasksService.get(id);
+            volunteerTasks.setIsShelves(status);
+            volunteerTasks.setUpdateBy(subject);
+            volunteerTasks.setUpdateTime(new Date());
+
+            int affectCount = volunteerTasksService.update(volunteerTasks);
+
+            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;
+    }
 }