fix: 党建工作考核评分管理字段调整

src/main/java/com/ghsc/partybuild/model/PtCheckscoreExample.java

@@ -2,6 +2,7 @@ package com.ghsc.partybuild.model;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class PtCheckscoreExample {
@@ -624,6 +625,406 @@ public class PtCheckscoreExample {
             addCriterion("recordStatus not between", value1, value2, "recordstatus");
             return (Criteria) this;
         }
+
+        public Criteria andCreatetimeIsNull() {
+            addCriterion("createTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIsNotNull() {
+            addCriterion("createTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeEqualTo(Date value) {
+            addCriterion("createTime =", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotEqualTo(Date value) {
+            addCriterion("createTime <>", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeGreaterThan(Date value) {
+            addCriterion("createTime >", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("createTime >=", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeLessThan(Date value) {
+            addCriterion("createTime <", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("createTime <=", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIn(List<Date> values) {
+            addCriterion("createTime in", values, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotIn(List<Date> values) {
+            addCriterion("createTime not in", values, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeBetween(Date value1, Date value2) {
+            addCriterion("createTime between", value1, value2, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("createTime not between", value1, value2, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridIsNull() {
+            addCriterion("createUserId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridIsNotNull() {
+            addCriterion("createUserId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridEqualTo(String value) {
+            addCriterion("createUserId =", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridNotEqualTo(String value) {
+            addCriterion("createUserId <>", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridGreaterThan(String value) {
+            addCriterion("createUserId >", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridGreaterThanOrEqualTo(String value) {
+            addCriterion("createUserId >=", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridLessThan(String value) {
+            addCriterion("createUserId <", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridLessThanOrEqualTo(String value) {
+            addCriterion("createUserId <=", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridLike(String value) {
+            addCriterion("createUserId like", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridNotLike(String value) {
+            addCriterion("createUserId not like", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridIn(List<String> values) {
+            addCriterion("createUserId in", values, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridNotIn(List<String> values) {
+            addCriterion("createUserId not in", values, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridBetween(String value1, String value2) {
+            addCriterion("createUserId between", value1, value2, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridNotBetween(String value1, String value2) {
+            addCriterion("createUserId not between", value1, value2, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateusernameIsNull() {
+            addCriterion("createUserName is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateusernameIsNotNull() {
+            addCriterion("createUserName is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateusernameEqualTo(String value) {
+            addCriterion("createUserName =", value, "createusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateusernameNotEqualTo(String value) {
+            addCriterion("createUserName <>", value, "createusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateusernameGreaterThan(String value) {
+            addCriterion("createUserName >", value, "createusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateusernameGreaterThanOrEqualTo(String value) {
+            addCriterion("createUserName >=", value, "createusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateusernameLessThan(String value) {
+            addCriterion("createUserName <", value, "createusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateusernameLessThanOrEqualTo(String value) {
+            addCriterion("createUserName <=", value, "createusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateusernameLike(String value) {
+            addCriterion("createUserName like", value, "createusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateusernameNotLike(String value) {
+            addCriterion("createUserName not like", value, "createusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateusernameIn(List<String> values) {
+            addCriterion("createUserName in", values, "createusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateusernameNotIn(List<String> values) {
+            addCriterion("createUserName not in", values, "createusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateusernameBetween(String value1, String value2) {
+            addCriterion("createUserName between", value1, value2, "createusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateusernameNotBetween(String value1, String value2) {
+            addCriterion("createUserName not between", value1, value2, "createusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNull() {
+            addCriterion("updateTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNotNull() {
+            addCriterion("updateTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeEqualTo(Date value) {
+            addCriterion("updateTime =", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
+            addCriterion("updateTime <>", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThan(Date value) {
+            addCriterion("updateTime >", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updateTime >=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThan(Date value) {
+            addCriterion("updateTime <", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("updateTime <=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIn(List<Date> values) {
+            addCriterion("updateTime in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
+            addCriterion("updateTime not in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+            addCriterion("updateTime between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("updateTime not between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridIsNull() {
+            addCriterion("updateUserId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridIsNotNull() {
+            addCriterion("updateUserId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridEqualTo(String value) {
+            addCriterion("updateUserId =", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridNotEqualTo(String value) {
+            addCriterion("updateUserId <>", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridGreaterThan(String value) {
+            addCriterion("updateUserId >", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridGreaterThanOrEqualTo(String value) {
+            addCriterion("updateUserId >=", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridLessThan(String value) {
+            addCriterion("updateUserId <", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridLessThanOrEqualTo(String value) {
+            addCriterion("updateUserId <=", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridLike(String value) {
+            addCriterion("updateUserId like", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridNotLike(String value) {
+            addCriterion("updateUserId not like", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridIn(List<String> values) {
+            addCriterion("updateUserId in", values, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridNotIn(List<String> values) {
+            addCriterion("updateUserId not in", values, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridBetween(String value1, String value2) {
+            addCriterion("updateUserId between", value1, value2, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridNotBetween(String value1, String value2) {
+            addCriterion("updateUserId not between", value1, value2, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateusernameIsNull() {
+            addCriterion("updateUserName is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateusernameIsNotNull() {
+            addCriterion("updateUserName is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateusernameEqualTo(String value) {
+            addCriterion("updateUserName =", value, "updateusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateusernameNotEqualTo(String value) {
+            addCriterion("updateUserName <>", value, "updateusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateusernameGreaterThan(String value) {
+            addCriterion("updateUserName >", value, "updateusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateusernameGreaterThanOrEqualTo(String value) {
+            addCriterion("updateUserName >=", value, "updateusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateusernameLessThan(String value) {
+            addCriterion("updateUserName <", value, "updateusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateusernameLessThanOrEqualTo(String value) {
+            addCriterion("updateUserName <=", value, "updateusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateusernameLike(String value) {
+            addCriterion("updateUserName like", value, "updateusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateusernameNotLike(String value) {
+            addCriterion("updateUserName not like", value, "updateusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateusernameIn(List<String> values) {
+            addCriterion("updateUserName in", values, "updateusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateusernameNotIn(List<String> values) {
+            addCriterion("updateUserName not in", values, "updateusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateusernameBetween(String value1, String value2) {
+            addCriterion("updateUserName between", value1, value2, "updateusername");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateusernameNotBetween(String value1, String value2) {
+            addCriterion("updateUserName not between", value1, value2, "updateusername");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/resources/mapping/PtCheckscoreMapper.xml

@@ -10,6 +10,12 @@
     <result column="checkUserName" jdbcType="VARCHAR" property="checkusername" />
     <result column="score" jdbcType="DECIMAL" property="score" />
     <result column="recordStatus" jdbcType="INTEGER" property="recordstatus" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createtime" />
+    <result column="createUserId" jdbcType="VARCHAR" property="createuserid" />
+    <result column="createUserName" jdbcType="VARCHAR" property="createusername" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updatetime" />
+    <result column="updateUserId" jdbcType="VARCHAR" property="updateuserid" />
+    <result column="updateUserName" jdbcType="VARCHAR" property="updateusername" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -70,7 +76,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    scoreId, dzzdm, year, quarter, checkUserId, checkUserName, score, recordStatus
+    scoreId, dzzdm, year, quarter, checkUserId, checkUserName, score, recordStatus, createTime, 
+    createUserId, createUserName, updateTime, updateUserId, updateUserName
   </sql>
   <select id="selectByExample" parameterType="com.ghsc.partybuild.model.PtCheckscoreExample" resultMap="BaseResultMap">
     select
@@ -105,10 +112,14 @@
   <insert id="insert" parameterType="com.ghsc.partybuild.model.PtCheckscore">
     insert into pt_checkscore (scoreId, dzzdm, year, 
       quarter, checkUserId, checkUserName, 
-      score, recordStatus)
+      score, recordStatus, createTime, 
+      createUserId, createUserName, updateTime, 
+      updateUserId, updateUserName)
     values (#{scoreid,jdbcType=VARCHAR}, #{dzzdm,jdbcType=VARCHAR}, #{year,jdbcType=INTEGER}, 
       #{quarter,jdbcType=INTEGER}, #{checkuserid,jdbcType=VARCHAR}, #{checkusername,jdbcType=VARCHAR}, 
-      #{score,jdbcType=DECIMAL}, #{recordstatus,jdbcType=INTEGER})
+      #{score,jdbcType=DECIMAL}, #{recordstatus,jdbcType=INTEGER}, #{createtime,jdbcType=TIMESTAMP}, 
+      #{createuserid,jdbcType=VARCHAR}, #{createusername,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, 
+      #{updateuserid,jdbcType=VARCHAR}, #{updateusername,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.ghsc.partybuild.model.PtCheckscore">
     insert into pt_checkscore
@@ -137,6 +148,24 @@
       <if test="recordstatus != null">
         recordStatus,
       </if>
+      <if test="createtime != null">
+        createTime,
+      </if>
+      <if test="createuserid != null">
+        createUserId,
+      </if>
+      <if test="createusername != null">
+        createUserName,
+      </if>
+      <if test="updatetime != null">
+        updateTime,
+      </if>
+      <if test="updateuserid != null">
+        updateUserId,
+      </if>
+      <if test="updateusername != null">
+        updateUserName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="scoreid != null">
@@ -163,6 +192,24 @@
       <if test="recordstatus != null">
         #{recordstatus,jdbcType=INTEGER},
       </if>
+      <if test="createtime != null">
+        #{createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createuserid != null">
+        #{createuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="createusername != null">
+        #{createusername,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null">
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateuserid != null">
+        #{updateuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="updateusername != null">
+        #{updateusername,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ghsc.partybuild.model.PtCheckscoreExample" resultType="java.lang.Long">
@@ -198,6 +245,24 @@
       <if test="record.recordstatus != null">
         recordStatus = #{record.recordstatus,jdbcType=INTEGER},
       </if>
+      <if test="record.createtime != null">
+        createTime = #{record.createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createuserid != null">
+        createUserId = #{record.createuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createusername != null">
+        createUserName = #{record.createusername,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatetime != null">
+        updateTime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateuserid != null">
+        updateUserId = #{record.updateuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateusername != null">
+        updateUserName = #{record.updateusername,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -212,7 +277,13 @@
       checkUserId = #{record.checkuserid,jdbcType=VARCHAR},
       checkUserName = #{record.checkusername,jdbcType=VARCHAR},
       score = #{record.score,jdbcType=DECIMAL},
-      recordStatus = #{record.recordstatus,jdbcType=INTEGER}
+      recordStatus = #{record.recordstatus,jdbcType=INTEGER},
+      createTime = #{record.createtime,jdbcType=TIMESTAMP},
+      createUserId = #{record.createuserid,jdbcType=VARCHAR},
+      createUserName = #{record.createusername,jdbcType=VARCHAR},
+      updateTime = #{record.updatetime,jdbcType=TIMESTAMP},
+      updateUserId = #{record.updateuserid,jdbcType=VARCHAR},
+      updateUserName = #{record.updateusername,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -241,6 +312,24 @@
       <if test="recordstatus != null">
         recordStatus = #{recordstatus,jdbcType=INTEGER},
       </if>
+      <if test="createtime != null">
+        createTime = #{createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createuserid != null">
+        createUserId = #{createuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="createusername != null">
+        createUserName = #{createusername,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null">
+        updateTime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateuserid != null">
+        updateUserId = #{updateuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="updateusername != null">
+        updateUserName = #{updateusername,jdbcType=VARCHAR},
+      </if>
     </set>
     where scoreId = #{scoreid,jdbcType=VARCHAR}
   </update>
@@ -252,7 +341,13 @@
       checkUserId = #{checkuserid,jdbcType=VARCHAR},
       checkUserName = #{checkusername,jdbcType=VARCHAR},
       score = #{score,jdbcType=DECIMAL},
-      recordStatus = #{recordstatus,jdbcType=INTEGER}
+      recordStatus = #{recordstatus,jdbcType=INTEGER},
+      createTime = #{createtime,jdbcType=TIMESTAMP},
+      createUserId = #{createuserid,jdbcType=VARCHAR},
+      createUserName = #{createusername,jdbcType=VARCHAR},
+      updateTime = #{updatetime,jdbcType=TIMESTAMP},
+      updateUserId = #{updateuserid,jdbcType=VARCHAR},
+      updateUserName = #{updateusername,jdbcType=VARCHAR}
     where scoreId = #{scoreid,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/static/app/main/party/checkScore/edit.html

@@ -81,7 +81,7 @@
                             </tbody>
                         </table>
                     </div>
-                    <div class="form_foot" ng-show="isVew">
+                    <div class="form_foot" ng-show="isView">
                         <button type="button" class="btn btn-default" ng-click="$hide()">取消</button>
                         <button type="submit" class="btn btn-primary" form="editForm">提交</button>
                     </div>

src/main/resources/static/app/main/party/checkScore/list.js

@@ -4,6 +4,7 @@
         $scope.isShow = false;
         $scope.moreTxt = "更多";
         $scope.pageId = "checkData";
+        $scope.isVew = true;
 
         //定义数据集合
         $scope.dataList = []; //列表数据
@@ -208,16 +209,19 @@
             animation: 'am-fade-and-slide-top'
         });
 
+        // 编辑按钮事件
         $scope.score = function (it) {
-            editModal.data = it;
+            editModal.data = JSON.parse(JSON.stringify(it));
+            editModal.isView = true;
             editModal.params = {
                 title: '录入考核评分'
             };
             editModal.$promise.then(editModal.show);
         };
+        // 查看按钮事件
         $scope.view = (it) => {
-            editModal.data = it;
-            editModal.isView = true;
+            editModal.data = JSON.parse(JSON.stringify(it));
+            editModal.isView = false;
             editModal.params = {
                 title: '查看考核评分'
             };