m

youxiw2000
1 parent 31bf7358
Showing 29 changed files with 221 additions and 59 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/FormHistoryDataServiceImpl.java
trash-ui/dist.zip
trash-ui/src/api/caseOfflineInfo.js
trash-ui/src/api/taskhismethod.js
trash-ui/src/api/taskmethod.js
trash-ui/src/api/three_step.js
trash-ui/src/api/truck_active.js
trash-ui/src/api/vio_casefile_info.js
trash-ui/src/api/vio_warning_info.js
trash-ui/src/utils/request.js
trash-ui/src/utils/requestRemote.js
trash-ui/src/views/casefile/violationCaseFile/index.vue
trash-ui/src/views/h5/dayWorkReport/index.vue
trash-ui/src/views/h5/truckActivate/index.vue
trash-workFlow/src/main/java/com/trash/business/mapper/TruckCreditMapper.java
trash-workFlow/src/main/java/com/trash/business/service/impl/CompanyCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationCaseFileController.java
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationWarningInformationController.java
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationCaseFile.java
@@ -72,13 +72,17 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
         	actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey( "workflow_constructsite:" + id));
         	actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey("workflow_constructsite_edit:" + id));
-            
-            
+        }else if(businessKey.contains("earthsites")){
+        	String id = businessKey.split(":")[1];
+
+        	actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey( "workflow_earthsites:" + id));
+           
+        	actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey("workflow_earthsites_edit:" + id));
         }else{
         	actWorkflowFormData = actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey(businessKey);
         }
-		
+        
         for(int i =0;i<actWorkflowFormData.size();i++){
@@ -195,7 +195,7 @@ export default {
           if(response.data.status == 0){
             historyFromData(this.workflow + ":" + id).then(response => {
-                 let obj = response.data[response.data.length-1];
+                 let obj = response.data[0];
                 let data  = {
                   reply:obj.controlValue,
                   replyPeople:obj.createBy,
@@ -153,7 +153,7 @@ export default {
             this.construct = true;
           return;
         }
-        if (this.definitionKey == "workflow_earthsites") {
+        if (this.definitionKey == "workflow_earthsites" || this.definitionKey == "workflow_earthsites_edit") {
           this.earthsites = true;
           return;
         }
@@ -236,7 +236,7 @@ export default {
             this.construct = true;
             return;
           }
-          if (this.definitionKey == "workflow_earthsites") {
+          if (this.definitionKey == "workflow_earthsites" || this.definitionKey == "workflow_earthsites_edit") {
             this.earthsites = true;
             return;
           }
@@ -524,7 +524,8 @@ export default {
           this.definitionKey == "workflow_vehicle" ||
           this.definitionKey == "workflow_earthsites" ||
           this.definitionKey == "workflow_conract" ||
-          this.definitionKey == "workflow_constructsite_edit") {
+          this.definitionKey == "workflow_constructsite_edit" || 
+          this.definitionKey == "workflow_earthsites_edit") {
           formDataSave(this.id, this.form.formData).then(response => {
             this.msgSuccess("审批成功");
             this.cancel();
@@ -346,6 +346,10 @@ export default {
             this.remoteQueryData.limitStatus = 0;
           constructionsitesLedgerList(this.remoteQueryData).then(res => {
+            if(this.form.type != "0"){
+              return;
+            }
+            this.remoteData = [];
             for(let i in  res.result.list){
               this.remoteData.push(res.result.list[i]);
@@ -364,12 +368,15 @@ export default {
               // this.rules.trucks[0].required = true;
           });
-        } else {
-          debugger;
+        } else if (this.form.type == "0") {
           if(this.remoteQueryData.areaCode)
             this.remoteQueryData.areaCode = [this.remoteQueryData.areaCode+""];
             this.remoteQueryData.overdue = 0;
             earthsitesLedgerList(this.remoteQueryData).then(res => {
+              if(this.form.type != "1"){
+                return;
+              }
+              this.remoteData = [];
               for(let i in  res.result.list){
                 this.remoteData.push(res.result.list[i]);
                 if(res.result.list[i].name == this.form.name){
@@ -291,7 +291,7 @@ export default {
           let list = tres.result.list;
           let qr = {
-            constructionId:item.objectId,
+            company:value,
             status:0
           }
@@ -57,18 +57,36 @@ export default {
         })
       });
- listReplyApprovalProcess({tableName: "workflow_casefile" + ":" + this.idInfo}).then(response => {
-          this.replyApprovalProcessList = response.rows;
+        listReplyApprovalProcess({tableName: "workflow_casefile" + ":" + this.idInfo}).then(response => {
+          let array = response.rows;
           if(this.form.status == 0){
             historyFromData("workflow_casefile" + ":" + this.idInfo).then(response => {
-
-                 let obj = response.data[response.data.length-1];
+                let newRep = [];
+                let obj = response.data[0];
                 let data  = {
                   reply:obj.controlValue,
                   replyPeople:obj.createBy,
+                  replyTime:obj.createTime
                 };
-                this.replyApprovalProcessList.push(data);
+                newRep.push(data);
+
+                for(let j in array){
+                    newRep.push(array[j]);
+                }
+
+                if(response.data.length - array.length == 2){
+                let obj = response.data[response.data.length -1];
+                  let data  = {
+                    reply:obj.controlValue,
+                    replyPeople:obj.createBy,
+                    replyTime:obj.createTime
+                  };
+                    newRep.push(data);
+                }
+
+                this.replyApprovalProcessList = newRep;
+                this.$forceUpdate();
             });
           }
         });
@@ -100,4 +118,4 @@ export default {
       return process.env.VUE_APP_BASE_API + path;
     },
   }
-}
 \ No newline at end of file
+}
@@ -59,17 +59,35 @@ export default {
       });
         listReplyApprovalProcess({tableName: "violation_warning" + ":" + this.idInfo}).then(response => {
-          this.replyApprovalProcessList = response.rows;
+          let array = response.rows;
           if(this.form.status == 0){
             historyFromData("violation_warning" + ":" + this.idInfo).then(response => {
-
-                 let obj = response.data[response.data.length-1];
+                let newRep = [];
+                let obj = response.data[0];
                 let data  = {
                   reply:obj.controlValue,
                   replyPeople:obj.createBy,
+                  replyTime:obj.createTime
                 };
-                this.replyApprovalProcessList.push(data);
+                newRep.push(data);
+
+                for(let j in array){
+                    newRep.push(array[j]);
+                }
+
+                if(response.data.length - array.length == 2){
+                let obj = response.data[response.data.length -1];
+                  let data  = {
+                    reply:obj.controlValue,
+                    replyPeople:obj.createBy,
+                    replyTime:obj.createTime
+                  };
+                    newRep.push(data);
+                }
+
+                this.replyApprovalProcessList = newRep;
+                this.$forceUpdate();
             });
           }
         });
@@ -100,4 +118,4 @@ export default {
       return process.env.VUE_APP_BASE_API + path;
     },
   }
-}
 \ No newline at end of file
+}
@@ -14,7 +14,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 20000
+  timeout: 180000
 })
 // request拦截器
 service.interceptors.request.use(config => {
@@ -12,7 +12,7 @@ axios.defaults.headers[&#39;Content-Type&#39;] = &#39;application/json;charset=utf-8&#39;
 // 创建axios实例
 const service = axios.create({
   // 超时
-  timeout: 10000
+  timeout: 180000
 })
 // request拦截器
 service.interceptors.request.use(config => {
@@ -217,6 +217,13 @@
             <el-radio label="区管理部门">区管理部门</el-radio>
             <el-radio label="运输企业">运输企业</el-radio>
           </el-radio-group>
+        </el-form-item>
+
+        <el-form-item label="推送对象">
+          <el-radio-group v-model="form.needUpload">
+            <el-radio label="0" checked="checked" >否</el-radio>
+            <el-radio label="1">是</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="附件预览" v-if="slide1.length!=0">
           <el-image v-for="item in slide1"
@@ -62,14 +62,20 @@
          <el-row>
          <el-form-item label="开始时间" v-if="this.queryParams.his > 0">
                <el-date-picker
-                 v-model="queryParams.timeRange"
+                 v-model="queryParams.workStartTime"
                  value-format="yyyy-MM-dd HH:mm:ss"
-                 type="datetimerange"
-                 range-separator="至"
-                 start-placeholder="开始日期"
-                 end-placeholder="结束日期">
+                 type="datetime"
+                 placeholder="开始日期">
                </el-date-picker>
-         </el-form-item>
+         </el-form-item>
+		 <el-form-item label="结束日期" v-if="this.queryParams.his > 0">
+		       <el-date-picker
+		         v-model="queryParams.workEndTime"
+		         value-format="yyyy-MM-dd HH:mm:ss"
+		         type="datetime"
+		         placeholder="结束日期">
+		       </el-date-picker>
+		 </el-form-item>
          </el-row>
          <el-form-item>
            <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
@@ -32,14 +32,25 @@
          <el-option label="未激活" value="0"/>
          <el-option label="已激活" value="1"/>
        </el-select>
-     </el-form-item>
-     <el-form-item label="激活时间" prop="createTime" v-if="openActivateTime">
-        <el-date-picker v-model="queryParams.createTime" type="datetimerange"
-           start-placeholder="开始日期"
-           value-format="yyyy-MM-dd HH:mm:ss"
-           end-placeholder="结束日期">
-       </el-date-picker>
-     </el-form-item>
+     </el-form-item>
+	 <el-form-item label="开始时间" v-if="openActivateTime">
+	       <el-date-picker
+	         v-model="queryParams.startTime"
+	         value-format="yyyy-MM-dd HH:mm:ss"
+	         type="datetime"
+	         placeholder="开始日期">
+	       </el-date-picker>
+	 </el-form-item>
+	 <el-form-item label="结束时间" v-if="openActivateTime">
+	       <el-date-picker
+	         v-model="queryParams.endTime"
+	         value-format="yyyy-MM-dd HH:mm:ss"
+	         type="datetime"
+	         placeholder="结束日期">
+	       </el-date-picker>
+	 </el-form-item>
+	 
+	 
      <el-form-item>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -65,4 +65,6 @@ public interface TruckCreditMapper
     List<TruckCredit> selectTruckCreditHistory(TruckCredit truckCredit);
 	public List<String> getCompanys(TruckCredit truckCredit);
+
+	TruckCredit selectTruckCreditByObjectId(String objectId);
 }
 \ No newline at end of file
@@ -150,6 +150,7 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 		map.put("companyID", companyId);
 		map.put("valid", 0);
+		map.put("size", 99999);
 		JSONArray turckList = null;
 		if (token == null) {
 			RemoteServerUtils.updateCompanyList(cpcList);
@@ -129,6 +129,7 @@ public class TruckCreditServiceImpl implements ITruckCreditService
         if(old.size() > 0){
         	i = 1;
         }else{
+            cc.setTime(new Date());
         	i = truckCreditMapper.insertTruckCredit(truckCredit);
         }
@@ -145,8 +146,16 @@ public class TruckCreditServiceImpl implements ITruckCreditService
     @Override
     @Transactional
     public int updateTruckCredit(TruckCredit truckCredit)
-    {
-        TruckCredit cc = truckCreditMapper.selectTruckCreditById(truckCredit.getId());
+    {	
+    	TruckCredit cc = null;
+    	if(truckCredit.getObjectId() != null){
+    		cc = truckCreditMapper.selectTruckCreditByObjectId(truckCredit.getObjectId());
+    	}else{
+    		cc = truckCreditMapper.selectTruckCreditById(truckCredit.getId());
+    	}
+    	
+    	if(cc == null)
+    		return 0;
         cc.setStatus(1L);
@@ -155,7 +164,17 @@ public class TruckCreditServiceImpl implements ITruckCreditService
             cc.setReason(truckCredit.getReason());
             cc.setLostCredit(0L);
+            
+            List<Map> listParam = new ArrayList<>();
+            Map param = new HashMap<>();
+
+			param.put("id", cc.getObjectId());
+			param.put("creditStatus", 0);
+
+			listParam.add(param);
+			RemoteServerUtils.updateTruckList(listParam);
+            
             return insertTruckCredit(cc);
         } catch (Exception e) {
@@ -133,10 +133,10 @@ public class ViolationCaseFileController extends BaseController {
 			"其他2", "其他3", "其他4", "其他5" };
 	@GetMapping(value = "/caseTable")
-	public AjaxResult getTable(String owningRegion, String startDate, String endDate) {
+	public AjaxResult getTable(String owningRegion, String startDate, String endDate,String violationObjectType) {
 		List<HashMap<String, String>> maps = new ArrayList<HashMap<String, String>>();
-		if (owningRegion.equals("长沙市")) {
+		if (owningRegion == null || owningRegion.equals("长沙市")) {
 			owningRegion = "";
 		}
@@ -146,7 +146,7 @@ public class ViolationCaseFileController extends BaseController {
 		}
 		List<ViolationCaseFile> list = violationCaseFileService.selectViolationCaseFileListByTable(owningRegion,
-				startDate, endDate);
+				startDate, endDate,violationObjectType);
 		for (String type : caseType) {
@@ -141,17 +141,17 @@ public class ViolationWarningInformationController extends BaseController
             "闯禁行驶", "失信车辆作业", "卫星定位异常"};
     @GetMapping(value = "/caseTable")
-    public AjaxResult getTable(String owningRegion,String startDate,String endDate){
+    public AjaxResult getTable(String owningRegion,String startDate,String endDate,String violationObjectType){
         List<HashMap<String, String>> maps = new ArrayList<HashMap<String,String>>();
-        if(owningRegion.equals("长沙市")){
+        if(owningRegion == null || owningRegion.equals("长沙市")){
             owningRegion = "";
         }
         if(startDate != null && endDate != null&&startDate!=""&&endDate!=""){
             startDate = startDate.substring(0,10);
             endDate = endDate.substring(0,10);
         }
-        List<ViolationWarningInformation> list = violationWarningInformationService.selectViolationWarningInformationListByTable(owningRegion,startDate,endDate);
+        List<ViolationWarningInformation> list = violationWarningInformationService.selectViolationWarningInformationListByTable(owningRegion,startDate,endDate,violationObjectType);
         for(String type:caseType){
@@ -87,8 +87,19 @@ public class ViolationCaseFile extends BaseEntity
     private List<String> names;
+    private short needUpload;
-    public List<String> getNames() {
+    
+    
+    public short getNeedUpload() {
+		return needUpload;
+	}
+
+	public void setNeedUpload(short needUpload) {
+		this.needUpload = needUpload;
+	}
+
+	public List<String> getNames() {
 		return names;
 	}
@@ -28,7 +28,7 @@ public interface ViolationCaseFileMapper
      */
     List<ViolationCaseFile> selectViolationCaseFileList(ViolationCaseFile violationCaseFile);
-    List<ViolationCaseFile> selectViolationCaseFileListByTable(@Param("owningRegion") String owningRegion, @Param("startDate")String startDate, @Param("endDate")String endDate);
+    List<ViolationCaseFile> selectViolationCaseFileListByTable(@Param("owningRegion") String owningRegion, @Param("startDate")String startDate, @Param("endDate")String endDate, @Param("violationObjectType")String violationObjectType);
     /**
      * 新增平台违规案卷
@@ -37,7 +37,7 @@ public interface ViolationWarningInformationMapper
      * @return 违规预警信息集合
      */
     List<ViolationWarningInformation> selectViolationWarningInformationList(ViolationWarningInformation violationWarningInformation);
-    List<ViolationWarningInformation> selectViolationWarningInformationListByTable(@Param("owningRegion") String owningRegion,@Param("startDate")String startDate,@Param("endDate")String endDate);
+    List<ViolationWarningInformation> selectViolationWarningInformationListByTable(@Param("owningRegion") String owningRegion,@Param("startDate")String startDate,@Param("endDate")String endDate, @Param("violationObjectType")String violationObjectType);
     /**
      * 新增违规预警信息
      * 
@@ -30,7 +30,7 @@ public interface IViolationCaseFileService
      */
     List<ViolationCaseFile> selectViolationCaseFileList(ViolationCaseFile violationCaseFile);
-    List<ViolationCaseFile> selectViolationCaseFileListByTable(String owningRegion,String startDate,String endDate);
+    List<ViolationCaseFile> selectViolationCaseFileListByTable(String owningRegion,String startDate,String endDate,String violationObjectType);
     /**
      * 新增平台违规案卷
@@ -32,7 +32,7 @@ public interface IViolationWarningInformationService {
      */
     List<ViolationWarningInformation> selectViolationWarningInformationList(ViolationWarningInformation violationWarningInformation);
-    List<ViolationWarningInformation> selectViolationWarningInformationListByTable(String owningRegion,String startDate,String endDate);
+    List<ViolationWarningInformation> selectViolationWarningInformationListByTable(String owningRegion,String startDate,String endDate,String violationObjectType);
     /**
      * 新增违规预警信息
@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import com.trash.casefile.domain.ViolationCaseFile;
+import com.trash.casefile.domain.ViolationWarningInformation;
 import com.trash.casefile.domain.vo.ViolationCaseFileVo;
 import com.trash.casefile.mapper.ViolationCaseFileMapper;
 import com.trash.casefile.service.IViolationCaseFileService;
@@ -135,10 +136,32 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
         return violationCaseFileMapper.selectViolationCaseFileList(violationCaseFile);
     }
+    
+	String cString = "工地预警-未报开工作业,工地预警-视频设备离线超时报警,工地预警-三无车辆进入工地,工地预警-未按时间作业,";
+	String eString = "处理场所预警-未报开工作业,处理场所预警-视频设备离线超时报警,处理场所预警-三无车辆进入处理场所,处理场所预警-未到指定的处理场所作业";
+	String tString = "离线运输报警(工),离线运输报警(消),未激活车辆作业,未核准作业车辆作业,未按线路行驶,闯禁行驶,失信车辆作业,卫星定位异常";
+	
     @Override
-    public List<ViolationCaseFile> selectViolationCaseFileListByTable(String owningRegion,String startDate,String endDate)
-    {
-        return violationCaseFileMapper.selectViolationCaseFileListByTable(owningRegion,startDate,endDate);
+    public List<ViolationCaseFile> selectViolationCaseFileListByTable(String owningRegion,String startDate,String endDate,String violationObjectType)
+    {	
+    	
+    	
+	List<ViolationCaseFile> list = violationCaseFileMapper.selectViolationCaseFileListByTable(owningRegion,startDate,endDate,violationObjectType);
+		
+		if(violationObjectType != null && !violationObjectType.isEmpty()){
+			List<ViolationCaseFile> newList = new ArrayList<>();
+			for(ViolationCaseFile v:list){
+				if(violationObjectType.equals("0") && cString.contains(v.getViolationType())
+						||	(violationObjectType.equals("1") && eString.contains(v.getViolationType()))
+						|| (violationObjectType.equals("2") && tString.contains(v.getViolationType()))){
+						newList.add(v);
+				}
+			}
+			return newList;
+		}else{
+			return list;
+		}
+    	
     }
     /**
@@ -24,6 +24,8 @@ import com.trash.common.utils.file.FileUploadUtils;
 import com.trash.office.domain.UploadFile;
 import com.trash.office.mapper.UploadFileMapper;
 import com.trash.workflow.service.IWorkflowService;
+
+import org.apache.ibatis.javassist.expr.NewArray;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -135,11 +137,32 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
 		return violationWarningInformationMapper.selectViolationWarningInformationList(violationWarningInformation);
 	}
+	
+	String cString = "工地预警-未报开工作业,工地预警-视频设备离线超时报警,工地预警-三无车辆进入工地,工地预警-未按时间作业,";
+	String eString = "处理场所预警-未报开工作业,处理场所预警-视频设备离线超时报警,处理场所预警-三无车辆进入处理场所,处理场所预警-未到指定的处理场所作业";
+	String tString = "离线运输报警(工),离线运输报警(消),未激活车辆作业,未核准作业车辆作业,未按线路行驶,闯禁行驶,失信车辆作业,卫星定位异常";
+
 	@Override
-	public List<ViolationWarningInformation> selectViolationWarningInformationListByTable(String owningRegion,
-			String startDate, String endDate) {
-		return violationWarningInformationMapper.selectViolationWarningInformationListByTable(owningRegion, startDate,
-				endDate);
+	public List<ViolationWarningInformation> selectViolationWarningInformationListByTable(String owningRegion,String startDate, String endDate,String violationObjectType) {
+		
+		
+		List<ViolationWarningInformation> list = violationWarningInformationMapper.selectViolationWarningInformationListByTable(owningRegion, startDate,endDate,violationObjectType);
+		
+		if(violationObjectType != null && !violationObjectType.isEmpty()){
+			List<ViolationWarningInformation> newList = new ArrayList<>();
+			for(ViolationWarningInformation v:list){
+				if(violationObjectType.equals("0") && cString.contains(v.getViolationType())
+						||	(violationObjectType.equals("1") && eString.contains(v.getViolationType()))
+						|| (violationObjectType.equals("2") && tString.contains(v.getViolationType()))){
+						newList.add(v);
+				}
+			}
+			return newList;
+		}else{
+			return list;
+		}
+		
+		
 	}
 	/**
@@ -40,7 +40,7 @@
         </where>
         order by time DESC
     </select>
-
+    
     <select id="selectCompanyCreditById" parameterType="Long" resultMap="CompanyCreditResult">
         <include refid="selectCompanyCreditVo"/>
         where id = #{id}
@@ -42,6 +42,11 @@
         </where>
         order by time DESC
     </select>
+    
+    <select id="selectTruckCreditByObjectId" parameterType="String" resultMap="TruckCreditResult">
+        <include refid="selectTruckCreditVo"/>
+        where object_id = #{objectId} and status = 0
+    </select>
     <select id="selectTruckCreditById" parameterType="Long" resultMap="TruckCreditResult">
         <include refid="selectTruckCreditVo"/>
@@ -25,10 +25,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="readBy"    column="read_by"    />
         <result property="readTime"    column="read_time"    />
         <result property="abbreviation"    column="abbreviation"    />
+        <result property="needUpload"    column="need_upload"    />
+        
     </resultMap>
     <sql id="selectViolationCaseFileVo">
-        select id, `number`, violation_object_type, owning_region, violation_type, violation_grade, project_name, company_name, `describe`, send_object, create_time, create_by, update_time, update_by, status, receive, receive_status, read_by, read_time,abbreviation from casefile_violation
+        select id, `number`, violation_object_type, owning_region, violation_type, violation_grade, project_name, company_name, `describe`, send_object, create_time, create_by, update_time, update_by, status, receive, receive_status, read_by, read_time,abbreviation,need_upload from casefile_violation
     </sql>
     <select id="selectViolationCaseFileList" parameterType="violationCaseFile" resultMap="violationCaseFileResult">
@@ -93,6 +95,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="readBy != null">read_by,</if>
             <if test="readTime != null">read_time,</if>
             <if test="abbreviation != null">abbreviation,</if>
+            <if test="needUpload != null">need_upload,</if>
+            
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             now(),
@@ -112,6 +116,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="readBy != null">#{readBy},</if>
             <if test="readTime != null">#{readTime},</if>
             <if test="abbreviation != null">#{abbreviation},</if>
+            <if test="needUpload != null">need_upload = #{needUpload},</if>
          </trim>
     </insert>
@@ -135,6 +140,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="readBy != null">read_by = #{readBy},</if>
             <if test="readTime != null">read_time = #{readTime},</if>
             <if test="abbreviation != null">abbreviation = #{abbreviation},</if>
+            <if test="needUpload != null">need_upload = #{needUpload},</if>
         </trim>
         where id = #{id}
     </update>