Your commit message

2024-10-27 22:00:35 +08:00 · 2024-10-27 22:00:35 +08:00 · 3fbf6fc170
commit 3fbf6fc170
parent 5fc54d3b17
5 changed files with 4366 additions and 4003 deletions
--- a/car-dao/src/main/java/com/weiqi/mis/domain/WxXrPemsOrder.java
+++ b/car-dao/src/main/java/com/weiqi/mis/domain/WxXrPemsOrder.java
@ -85,6 +85,14 @@ public class WxXrPemsOrder {

    private String factoryname;

+    private String imgUrl;
+
+    private String pdfUrl;
+
+    private Integer syncStatus;
+
+    private String syncResponse;
+
    private String vinContent;

    public Integer getId() {
@ -415,6 +423,38 @@ public class WxXrPemsOrder {
        this.factoryname = factoryname == null ? null : factoryname.trim();
    }

+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl == null ? null : imgUrl.trim();
+    }
+
+    public String getPdfUrl() {
+        return pdfUrl;
+    }
+
+    public void setPdfUrl(String pdfUrl) {
+        this.pdfUrl = pdfUrl == null ? null : pdfUrl.trim();
+    }
+
+    public Integer getSyncStatus() {
+        return syncStatus;
+    }
+
+    public void setSyncStatus(Integer syncStatus) {
+        this.syncStatus = syncStatus;
+    }
+
+    public String getSyncResponse() {
+        return syncResponse;
+    }
+
+    public void setSyncResponse(String syncResponse) {
+        this.syncResponse = syncResponse == null ? null : syncResponse.trim();
+    }
+
    public String getVinContent() {
        return vinContent;
    }
--- a/car-dao/src/main/java/com/weiqi/mis/domain/WxXrPemsOrderExample.java
+++ b/car-dao/src/main/java/com/weiqi/mis/domain/WxXrPemsOrderExample.java
@ -2804,6 +2804,276 @@ public class WxXrPemsOrderExample {
            addCriterion("FactoryName not between", value1, value2, "factoryname");
            return (Criteria) this;
        }
+
+        public Criteria andImgUrlIsNull() {
+            addCriterion("img_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlIsNotNull() {
+            addCriterion("img_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlEqualTo(String value) {
+            addCriterion("img_url =", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotEqualTo(String value) {
+            addCriterion("img_url <>", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlGreaterThan(String value) {
+            addCriterion("img_url >", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("img_url >=", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlLessThan(String value) {
+            addCriterion("img_url <", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlLessThanOrEqualTo(String value) {
+            addCriterion("img_url <=", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlLike(String value) {
+            addCriterion("img_url like", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotLike(String value) {
+            addCriterion("img_url not like", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlIn(List<String> values) {
+            addCriterion("img_url in", values, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotIn(List<String> values) {
+            addCriterion("img_url not in", values, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlBetween(String value1, String value2) {
+            addCriterion("img_url between", value1, value2, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotBetween(String value1, String value2) {
+            addCriterion("img_url not between", value1, value2, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdfUrlIsNull() {
+            addCriterion("pdf_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdfUrlIsNotNull() {
+            addCriterion("pdf_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdfUrlEqualTo(String value) {
+            addCriterion("pdf_url =", value, "pdfUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdfUrlNotEqualTo(String value) {
+            addCriterion("pdf_url <>", value, "pdfUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdfUrlGreaterThan(String value) {
+            addCriterion("pdf_url >", value, "pdfUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdfUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("pdf_url >=", value, "pdfUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdfUrlLessThan(String value) {
+            addCriterion("pdf_url <", value, "pdfUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdfUrlLessThanOrEqualTo(String value) {
+            addCriterion("pdf_url <=", value, "pdfUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdfUrlLike(String value) {
+            addCriterion("pdf_url like", value, "pdfUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdfUrlNotLike(String value) {
+            addCriterion("pdf_url not like", value, "pdfUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdfUrlIn(List<String> values) {
+            addCriterion("pdf_url in", values, "pdfUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdfUrlNotIn(List<String> values) {
+            addCriterion("pdf_url not in", values, "pdfUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdfUrlBetween(String value1, String value2) {
+            addCriterion("pdf_url between", value1, value2, "pdfUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdfUrlNotBetween(String value1, String value2) {
+            addCriterion("pdf_url not between", value1, value2, "pdfUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncStatusIsNull() {
+            addCriterion("sync_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncStatusIsNotNull() {
+            addCriterion("sync_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncStatusEqualTo(Integer value) {
+            addCriterion("sync_status =", value, "syncStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncStatusNotEqualTo(Integer value) {
+            addCriterion("sync_status <>", value, "syncStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncStatusGreaterThan(Integer value) {
+            addCriterion("sync_status >", value, "syncStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("sync_status >=", value, "syncStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncStatusLessThan(Integer value) {
+            addCriterion("sync_status <", value, "syncStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("sync_status <=", value, "syncStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncStatusIn(List<Integer> values) {
+            addCriterion("sync_status in", values, "syncStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncStatusNotIn(List<Integer> values) {
+            addCriterion("sync_status not in", values, "syncStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncStatusBetween(Integer value1, Integer value2) {
+            addCriterion("sync_status between", value1, value2, "syncStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("sync_status not between", value1, value2, "syncStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncResponseIsNull() {
+            addCriterion("sync_response is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncResponseIsNotNull() {
+            addCriterion("sync_response is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncResponseEqualTo(String value) {
+            addCriterion("sync_response =", value, "syncResponse");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncResponseNotEqualTo(String value) {
+            addCriterion("sync_response <>", value, "syncResponse");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncResponseGreaterThan(String value) {
+            addCriterion("sync_response >", value, "syncResponse");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncResponseGreaterThanOrEqualTo(String value) {
+            addCriterion("sync_response >=", value, "syncResponse");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncResponseLessThan(String value) {
+            addCriterion("sync_response <", value, "syncResponse");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncResponseLessThanOrEqualTo(String value) {
+            addCriterion("sync_response <=", value, "syncResponse");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncResponseLike(String value) {
+            addCriterion("sync_response like", value, "syncResponse");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncResponseNotLike(String value) {
+            addCriterion("sync_response not like", value, "syncResponse");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncResponseIn(List<String> values) {
+            addCriterion("sync_response in", values, "syncResponse");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncResponseNotIn(List<String> values) {
+            addCriterion("sync_response not in", values, "syncResponse");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncResponseBetween(String value1, String value2) {
+            addCriterion("sync_response between", value1, value2, "syncResponse");
+            return (Criteria) this;
+        }
+
+        public Criteria andSyncResponseNotBetween(String value1, String value2) {
+            addCriterion("sync_response not between", value1, value2, "syncResponse");
+            return (Criteria) this;
+        }
    }

    public static class Criteria extends GeneratedCriteria {
--- a/car-dao/src/main/resources/com/weiqi/mis/mapper/WxXrPemsOrderMapper.xml
+++ b/car-dao/src/main/resources/com/weiqi/mis/mapper/WxXrPemsOrderMapper.xml
@ -43,6 +43,10 @@
    <result column="ExhaustStructure" property="exhauststructure" jdbcType="VARCHAR" />
    <result column="FactoryId" property="factoryid" jdbcType="INTEGER" />
    <result column="FactoryName" property="factoryname" jdbcType="VARCHAR" />
+    <result column="img_url" property="imgUrl" jdbcType="VARCHAR" />
+    <result column="pdf_url" property="pdfUrl" jdbcType="VARCHAR" />
+    <result column="sync_status" property="syncStatus" jdbcType="INTEGER" />
+    <result column="sync_response" property="syncResponse" jdbcType="VARCHAR" />
  </resultMap>
  <resultMap id="ResultMapWithBLOBs" type="com.weiqi.mis.domain.WxXrPemsOrder" extends="BaseResultMap" >
    <result column="vin_content" property="vinContent" jdbcType="LONGVARCHAR" />
@ -83,7 +87,7 @@
    BrandId, BrandName, SeriesId, SeriesName, ProductionYear, EngineStructure, EngineStructureNumber, 
    ElectronicFuelType, TransmissionCase, DriveType, EmissionStandard, Status, create_time, 
    update_time, wx_xr_pems_user_id, check_up_result, wx_xr_pems_user_name, ExhaustStructure, 
-    FactoryId, FactoryName
+    FactoryId, FactoryName, img_url, pdf_url, sync_status, sync_response
  </sql>
  <sql id="Blob_Column_List" >
    vin_content
@ -147,7 +151,9 @@
      EmissionStandard, Status, create_time, 
      update_time, wx_xr_pems_user_id, check_up_result, 
      wx_xr_pems_user_name, ExhaustStructure, FactoryId, 
-      FactoryName, vin_content)
+      FactoryName, img_url, pdf_url, 
+      sync_status, sync_response, vin_content
+      )
    values (#{id,jdbcType=INTEGER}, #{orderno,jdbcType=VARCHAR}, #{mid,jdbcType=INTEGER}, 
      #{mname,jdbcType=VARCHAR}, #{orderuserid,jdbcType=INTEGER}, #{orderusername,jdbcType=VARCHAR}, 
      #{admissiontime,jdbcType=TIMESTAMP}, #{constructionstarttime,jdbcType=TIMESTAMP}, 
@ -162,7 +168,9 @@
      #{emissionstandard,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
      #{updateTime,jdbcType=TIMESTAMP}, #{wxXrPemsUserId,jdbcType=INTEGER}, #{checkUpResult,jdbcType=INTEGER}, 
      #{wxXrPemsUserName,jdbcType=VARCHAR}, #{exhauststructure,jdbcType=VARCHAR}, #{factoryid,jdbcType=INTEGER}, 
-      #{factoryname,jdbcType=VARCHAR}, #{vinContent,jdbcType=LONGVARCHAR})
+      #{factoryname,jdbcType=VARCHAR}, #{imgUrl,jdbcType=VARCHAR}, #{pdfUrl,jdbcType=VARCHAR}, 
+      #{syncStatus,jdbcType=INTEGER}, #{syncResponse,jdbcType=VARCHAR}, #{vinContent,jdbcType=LONGVARCHAR}
+      )
  </insert>
  <insert id="insertSelective" parameterType="com.weiqi.mis.domain.WxXrPemsOrder" >
    insert into wx_xr_pems_order
@ -290,6 +298,18 @@
      <if test="factoryname != null" >
        FactoryName,
      </if>
+      <if test="imgUrl != null" >
+        img_url,
+      </if>
+      <if test="pdfUrl != null" >
+        pdf_url,
+      </if>
+      <if test="syncStatus != null" >
+        sync_status,
+      </if>
+      <if test="syncResponse != null" >
+        sync_response,
+      </if>
      <if test="vinContent != null" >
        vin_content,
      </if>
@ -418,6 +438,18 @@
      <if test="factoryname != null" >
        #{factoryname,jdbcType=VARCHAR},
      </if>
+      <if test="imgUrl != null" >
+        #{imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="pdfUrl != null" >
+        #{pdfUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="syncStatus != null" >
+        #{syncStatus,jdbcType=INTEGER},
+      </if>
+      <if test="syncResponse != null" >
+        #{syncResponse,jdbcType=VARCHAR},
+      </if>
      <if test="vinContent != null" >
        #{vinContent,jdbcType=LONGVARCHAR},
      </if>
@ -552,6 +584,18 @@
      <if test="factoryname != null" >
        FactoryName = #{factoryname,jdbcType=VARCHAR},
      </if>
+      <if test="imgUrl != null" >
+        img_url = #{imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="pdfUrl != null" >
+        pdf_url = #{pdfUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="syncStatus != null" >
+        sync_status = #{syncStatus,jdbcType=INTEGER},
+      </if>
+      <if test="syncResponse != null" >
+        sync_response = #{syncResponse,jdbcType=VARCHAR},
+      </if>
      <if test="vinContent != null" >
        vin_content = #{vinContent,jdbcType=LONGVARCHAR},
      </if>
@ -600,6 +644,10 @@
      ExhaustStructure = #{exhauststructure,jdbcType=VARCHAR},
      FactoryId = #{factoryid,jdbcType=INTEGER},
      FactoryName = #{factoryname,jdbcType=VARCHAR},
+      img_url = #{imgUrl,jdbcType=VARCHAR},
+      pdf_url = #{pdfUrl,jdbcType=VARCHAR},
+      sync_status = #{syncStatus,jdbcType=INTEGER},
+      sync_response = #{syncResponse,jdbcType=VARCHAR},
      vin_content = #{vinContent,jdbcType=LONGVARCHAR}
    where ID = #{id,jdbcType=INTEGER}
  </update>
@ -644,7 +692,11 @@
      wx_xr_pems_user_name = #{wxXrPemsUserName,jdbcType=VARCHAR},
      ExhaustStructure = #{exhauststructure,jdbcType=VARCHAR},
      FactoryId = #{factoryid,jdbcType=INTEGER},
-      FactoryName = #{factoryname,jdbcType=VARCHAR}
+      FactoryName = #{factoryname,jdbcType=VARCHAR},
+      img_url = #{imgUrl,jdbcType=VARCHAR},
+      pdf_url = #{pdfUrl,jdbcType=VARCHAR},
+      sync_status = #{syncStatus,jdbcType=INTEGER},
+      sync_response = #{syncResponse,jdbcType=VARCHAR}
    where ID = #{id,jdbcType=INTEGER}
  </update>
 </mapper>
--- a/car-mis/src/main/resources/templates/car/orderInfo.html
+++ b/car-mis/src/main/resources/templates/car/orderInfo.html
@ -181,7 +181,7 @@
                ,
                cols: [
                    [ //标题栏
-                        {title: '明细列表', colspan: 8}
+                        {title: '明细列表', colspan: 9}
                    ],
                    [
                        {field: 'id', title: 'ID', width: 105}
@ -189,9 +189,10 @@
                        , {
                        field: 'mname', title: '施工单位名称', width: 220 }
                        , {field: 'orderuserid', title: '创建人id', width: 105} //minWidth：局部定义当前单元格的最小宽度，layui 2.2.1 新增
-                        , {field: 'orderusername', title: '订单创建人姓名', width: 150, sort: true}
-                        , {field: 'platenumber', title: '车牌号', sort: true}
-                        , {fixed: 'right', title: '同步', toolbar: '#barDemo', width: '5%', edit: 'text'}
+                        , {field: 'orderusername', title: '创建人', width: 80, sort: true}
+                        , {field: 'platenumber', title: '车牌号',  width: 100}
+                        , {field: 'syncStatus', title: '同步状态',  width: 90}
+                        , {fixed: 'right', title: '同步', toolbar: '#barDemo', width: '10%', edit: 'text'}

                    ]]