添加扣分项管理

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/Score.java

@@ -4,6 +4,10 @@ import lombok.Data;
 
 import java.util.Date;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 /**
  * 文件名：ScoreDeducting
  * 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
@@ -11,23 +15,36 @@ import java.util.Date;
 @Data
 public class Score {
     //编号
-    private Integer id;
-    //时间
-    private Date time;
-    //扣分内容
-    private String content;
+    private Long id;
+    //任务id
+    private Long task_id;
+    //更新时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date update_time;
     //图片数组
-    private String pictures;
+    private String pics;
     //视频数组
     private String videos;
-    //稽查任务编号
-    private Integer visual_inspection_task_id;
-    //名称
-    private String name;
     //考核项id
-    private Integer assessment_item_id;
+    private Long check_item_id;
+    //扣分内容
+    private String content;
     //考核人员ids
-    private String assessment_personnels;
+    private String checkman;
     //被考核人员id
-    private Integer check_personnel_id;
+    private Long checked_person;
+    //被考核部门
+    private Long checked_dept;
+    //备注
+    private String remark;
+    
+    //查询开始时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date start_time;
+    //查询结束时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date end_time;
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/ConstantController.java

@@ -33,8 +33,8 @@ public class ConstantController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/addConstant")
-    public String addConstant(@Valid @RequestBody Constant constant){
+    @RequestMapping(value = "/add")
+    public String add(@Valid @RequestBody Constant constant){
     	constantService.insert(constant);
     	return super.returnSuccessResult("添加成功");
     }
@@ -46,8 +46,8 @@ public class ConstantController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/updateConstant")
-    public String updateConstant(@RequestBody Constant constant){
+    @RequestMapping(value = "/update")
+    public String update(@RequestBody Constant constant){
     	constantService.update(constant);
     	return super.returnSuccessResult("修改成功");
     }
@@ -59,8 +59,8 @@ public class ConstantController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/deleteConstant")
-    public String deleteConstant(@RequestBody Constant constant){
+    @RequestMapping(value = "/delete")
+    public String delete(@RequestBody Constant constant){
     	if(constant.getId()==null){
     		throw new BusinessException(20002);
     	}

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/ScoreController.java

@@ -1,15 +1,17 @@
 package com.xintong.visualinspection.controller;
 
+import java.util.List;
+
 import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.xintong.visualinspection.bean.Constant;
-import com.xintong.visualinspection.service.ConstantService;
+import com.xintong.visualinspection.bean.Score;
+import com.xintong.visualinspection.err.BusinessException;
+import com.xintong.visualinspection.service.ScoreService;
 
 /**
  * 文件名：TestController
@@ -20,45 +22,74 @@ import com.xintong.visualinspection.service.ConstantService;
 public class ScoreController extends BaseController {
 
     @Autowired
-    private ConstantService constantService;
+    private ScoreService scoreService;
 
    
     /**
-     * 添加常量
+     * 添加扣分项
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/addConstant")
-    public String addConstant(@Valid @RequestBody Constant constant, BindingResult result){
-    	constantService.insert(constant);
+    @RequestMapping(value = "/add")
+    public String add(@Valid @RequestBody Score score){
+    	scoreService.insert(score);
     	return super.returnSuccessResult("添加成功");
     }
     
     /**
-     * 修改常量
+     * 修改扣分项
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/updateConstant")
-    public String updateConstant(@RequestBody Constant constant){
-    	constantService.update(constant);
+    @RequestMapping(value = "/update")
+    public String update(@Valid @RequestBody Score score){
+    	scoreService.update(score);
     	return super.returnSuccessResult("修改成功");
     }
     
     /**
-     * 删除常量
+     * 删除扣分项
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/deleteConstant")
-    public String deleteConstant(@RequestBody String id){
-    	constantService.delete(Long.parseLong(id));
+    @RequestMapping(value = "/delete")
+    public String delete(@RequestBody Score score){
+    	scoreService.delete(score.getId());
     	return super.returnSuccessResult("删除成功");
     }
+    
+    /**
+     * 通过任务id获取考核扣分项
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/getByTaskId")
+    public String getByTaskId(@RequestBody Score score){
+    	if(score.getTask_id()==null){
+    		throw new BusinessException(20002);
+    	}
+    	List<Score> scorelist = scoreService.getScoreListByTaskId(score.getTask_id());
+    	return super.returnSuccessResult(scorelist);
+    }
+    
+    /**
+     * 通过多条件获取考核扣分项
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/getScoreList")
+    public String getScoreList(@RequestBody Score score){
+    	List<Score> scorelist = scoreService.getScoreList(score);
+    	return super.returnSuccessResult(scorelist);
+    }
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TeamClassController.java

@@ -32,8 +32,8 @@ public class TeamClassController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/addClass")
-    public String addClass(@Valid @RequestBody TeamClass teamClass){
+    @RequestMapping(value = "/add")
+    public String add(@Valid @RequestBody TeamClass teamClass){
     	teamClassService.insert(teamClass);
     	return super.returnSuccessResult("添加成功");
     }
@@ -45,8 +45,8 @@ public class TeamClassController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/updateClass")
-    public String updateClass(@Valid @RequestBody TeamClass teamClass){
+    @RequestMapping(value = "/update")
+    public String update(@Valid @RequestBody TeamClass teamClass){
     	teamClassService.update(teamClass);
     	return super.returnSuccessResult("修改成功");
     }
@@ -58,8 +58,8 @@ public class TeamClassController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/deleteClass")
-    public String deleteClass(@RequestBody TeamClass teamClass){
+    @RequestMapping(value = "/delete")
+    public String delete(@RequestBody TeamClass teamClass){
     	teamClassService.delete(teamClass.getId());
     	return super.returnSuccessResult("删除成功");
     }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TeamController.java

@@ -32,8 +32,8 @@ public class TeamController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/addTeam")
-    public String addTeam(@Valid @RequestBody Team team){
+    @RequestMapping(value = "/add")
+    public String add(@Valid @RequestBody Team team){
     	teamService.insert(team);
     	return super.returnSuccessResult("添加成功");
     }
@@ -45,8 +45,8 @@ public class TeamController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/updateTeam")
-    public String updateTeam(@Valid @RequestBody Team team){
+    @RequestMapping(value = "/update")
+    public String update(@Valid @RequestBody Team team){
     	teamService.update(team);
     	return super.returnSuccessResult("修改成功");
     }
@@ -58,8 +58,8 @@ public class TeamController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/deleteTeam")
-    public String deleteTeam(@RequestBody Team team){
+    @RequestMapping(value = "/delete")
+    public String delete(@RequestBody Team team){
     	teamService.delete(team.getId());
     	return super.returnSuccessResult("删除成功");
     }

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/ScoreDao.java

@@ -1,10 +1,10 @@
 package com.xintong.visualinspection.dao.master;
 
-import com.xintong.visualinspection.bean.User;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
 
-import java.util.List;
+import com.xintong.visualinspection.bean.Score;
 
 /**
  * 文件名：UserInfoDao
@@ -12,10 +12,11 @@ import java.util.List;
  */
 @Mapper
 public interface ScoreDao  {
-    public List<User> getAll();
-    public User getOne(Long id);
-    public void insert(User user);
-    public void update(User user);
+    public List<Score> getAll();
+    public Score getOne(Long id);
+    public List<Score> getScoreList(Score score);
+    public List<Score> getScoreListByTaskId(Long task_id);
+    public void insert(Score score);
+    public void update(Score score);
     public void delete(Long id);
-    public User findByUserName(String username);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/ScoreMapper.xml

@@ -1,68 +1,74 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xintong.visualinspection.dao.master.ScoreDao" >
-    <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.User" >
+    <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.Score" >
         <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="username" property="username" jdbcType="VARCHAR" />
-        <result column="age" property="age" jdbcType="INTEGER" />
-        <result column="password" property="password" jdbcType="VARCHAR" />
-    </resultMap>
-    <resultMap id="userMap" type="com.xintong.visualinspection.bean.User">
-        <id property="id" column="ID"/>
-        <result property="username" column="username"/>
-        <result property="password" column="PASSWORD"/>
-        <collection property="roles" ofType="com.xintong.visualinspection.bean.Role">
-            <result column="name" property="name"/>
-        </collection>
+        <result column="task_id" property="task_id" jdbcType="INTEGER" />
+        <result column="update_time" property="update_time" jdbcType="DATE" />
+        <result column="pics" property="pics" jdbcType="VARCHAR" />
+        <result column="videos" property="videos" jdbcType="VARCHAR" />
+        <result column="check_item_id" property="check_item_id" jdbcType="INTEGER" />
+        <result column="content" property="content" jdbcType="VARCHAR" />
+        <result column="checkman" property="checkman" jdbcType="VARCHAR" />
+        <result column="checked_person" property="checked_person" jdbcType="INTEGER" />
+        <result column="checked_dept" property="checked_dept" jdbcType="INTEGER" />
+        <result column="remark" property="remark" jdbcType="VARCHAR" />
     </resultMap>
 
     <select id="getAll" resultMap="BaseResultMap"  >
-        SELECT
-        id,username,age,password
-        FROM sys_user
+        SELECT *
+        FROM check_score
     </select>
 
     <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
-        SELECT
-        id,username,age,password
-        FROM sys_user
+        SELECT *
+        FROM check_score
         WHERE id = #{id}
     </select>
+    
+    <select id="getScoreList" parameterType="java.lang.Long" resultMap="BaseResultMap" >
+        SELECT *
+        FROM check_score
+        WHERE 1=1
+        	 <if test="checked_person != null">AND checked_person = #{checked_person}</if>
+        	 <if test="check_item_id != null">AND check_item_id = #{check_item_id}</if>
+        	 <if test="checked_dept != null">AND checked_dept = #{checked_dept}</if>
+        	 <if test="start_time != null">AND update_time &gt;= #{start_time}</if>
+        	 <if test="end_time != null">AND update_time &lt;= #{end_time}</if>
+    </select>
+    
+    <select id="getScoreListByTaskId" parameterType="java.lang.Long" resultMap="BaseResultMap" >
+        SELECT *
+        FROM check_score
+        WHERE task_id = #{task_id}
+    </select>
 
-    <insert id="insert" parameterType="com.xintong.visualinspection.bean.User" >
+    <insert id="insert" parameterType="com.xintong.visualinspection.bean.Score" >
         INSERT INTO
-        sys_user
-        (username,age,password,TRUENAME,ORGANID,BIRTH,AGE,MOBILE,POSITIONID,SEX,WORKNO,IDNO)
+        check_score
+        (task_id,update_time,pics,videos,check_item_id,content,checkman,checked_person,checked_dept,emark)
         VALUES
-        (#{username}, #{age},#{password},#{truename},#{deptId},#{birth},#{age},#{mobile},#{positionId},#{sex},#{workno},#{idno})
+        (#{task_id}, #{update_time},#{pics},#{videos},#{check_item_id},#{content},#{checkman},#{checked_person},#{checked_dept},#{remark})
     </insert>
 
-    <update id="update" parameterType="com.xintong.visualinspection.bean.User" >
+    <update id="update" parameterType="com.xintong.visualinspection.bean.Score" >
         UPDATE
-        sys_user
+        check_score
         SET
-        <if test="username != null">userName = #{username},</if>
-        <if test="age != null">age = #{age},</if>
-        <if test="password != null">password = #{password},</if>
-        id = #{id}
+        <if test="update_time != null">update_time = #{update_time},</if>
+        <if test="pics != null">pics = #{pics},</if>
+        <if test="videos != null">videos = #{videos},</if>
+        <if test="checkman != null">checkman = #{checkman},</if>
+        <if test="checked_person != null">checked_person = #{checked_person},</if>
+        remark=#{remark}
         WHERE
         id = #{id}
     </update>
 
     <delete id="delete" parameterType="java.lang.Long" >
         DELETE FROM
-        sys_user
+        check_score
         WHERE
         id =#{id}
     </delete>
-
-
-    <select id="findByUserName" parameterType="String" resultMap="userMap">
-        select u.*
-        ,r.name
-        from sys_user u
-        LEFT JOIN sys_role_user sru on u.id= sru.Sys_User_id
-        LEFT JOIN sys_role r on sru.sys_role_id=r.id
-        where username= #{username}
-    </select>
 </mapper>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/ScoreService.java

@@ -18,10 +18,10 @@ import com.xintong.visualinspection.bean.Score;
  *
  */
 public interface ScoreService {
-    public List<Score> getAll();
-    public Constant getById(Long id);
-    public List<Score> getByFlag();
-    public Constant getByFlagAndValue(String flag, int value);
+	public List<Score> getAll();
+    public Score getOne(Long id);
+    public List<Score> getScoreList(Score score);
+    public List<Score> getScoreListByTaskId(Long task_id);
     public void insert(Score score);
     public void update(Score score);
     public void delete(Long id);

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/ScoreServiceImpl.java

@@ -6,14 +6,13 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.Score;
 import com.xintong.visualinspection.dao.master.ScoreDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.ScoreService;
 
 /**
- * 文件名：UserServiceImpl
+ * 文件名：ScoreServiceImpl
  * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 @Service
@@ -25,48 +24,45 @@ public class ScoreServiceImpl extends BaseService implements ScoreService {
     @Autowired
     private ScoreDao scoreDao;
 
-
-	public List getAll() {
+	@Override
+	public List<Score> getAll() {
 		// TODO Auto-generated method stub
-		return null;
+		return scoreDao.getAll();
 	}
 
-
-	public Constant getById(Long id) {
+	@Override
+	public Score getOne(Long id) {
 		// TODO Auto-generated method stub
-		return null;
+		return scoreDao.getOne(id);
 	}
 
-
-	public List getByFlag() {
+	@Override
+	public List<Score> getScoreList(Score score) {
 		// TODO Auto-generated method stub
-		return null;
+		return scoreDao.getScoreList(score);
 	}
 
-
-	public Constant getByFlagAndValue(String flag, int value) {
+	@Override
+	public List<Score> getScoreListByTaskId(Long task_id) {
 		// TODO Auto-generated method stub
-		return null;
+		return scoreDao.getScoreListByTaskId(task_id);
 	}
 
-
+	@Override
 	public void insert(Score score) {
 		// TODO Auto-generated method stub
-		
+		scoreDao.insert(score);
 	}
 
-
+	@Override
 	public void update(Score score) {
 		// TODO Auto-generated method stub
-		
+		scoreDao.update(score);
 	}
 
-
+	@Override
 	public void delete(Long id) {
 		// TODO Auto-generated method stub
-		
+		scoreDao.delete(id);
 	}
-
-
-    
 }