运单登记新增优化

地点管理优化
客户管理优化

src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java

@@ -127,10 +127,18 @@ public class TrafficSafetyMeetingController extends BaseController {
             if (start != null && end != null){
                 Date startDate = DateUtil.fomatDate(start);
                 Date endDate = DateUtil.fomatDate(end);
-                if (date.after(startDate) && date.before(endDate)){
-                    item.put("MEETING_STATUS",1);
-                }else if (date.after(endDate)){
-                    item.put("MEETING_STATUS",0);
+
+                // 如果当前时间还没到startDate
+                if (date.before(startDate)) {
+                    item.put("MEETING_STATUS", "0");
+                }
+                // 如果当前时间已经超过startDate且还没到endDate
+                else if (date.after(startDate) && date.before(endDate)) {
+                    item.put("MEETING_STATUS", "1");
+                }
+                // 如果当前时间超过endDate
+                else if (date.after(endDate)) {
+                    item.put("MEETING_STATUS", "2");
                 }
                 String meetingDate = start + "至" + end;
                 item.put("MEETING_DATE", meetingDate);

src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java

@@ -39,6 +39,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController
 
         String customermanagement_id = this.get32UUID(); // 生成主键ID
         pd.put("CUSTOMERMANAGEMENT_ID", customermanagement_id); // 设置客户管理ID
+        pd.put("CUSTOMERNAME_ID", this.get32UUID());
         pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 设置运输公司ID
         pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 设置创建人ID
         pd.put("CREATORNAME", Jurisdiction.getName()); // 设置创建人姓名
@@ -52,6 +53,8 @@ public class TrafficSecurityCustomerManagementController extends BaseController
             for (PageData contact : contacts) {
                 PageData contactPd = new PageData();
                 contactPd.put("CUSTOMERCONTACT_ID", this.get32UUID());
+                contactPd.put("CONTACT_ID", this.get32UUID());
+                contactPd.put("CUSTOMERADDRESS_ID", this.get32UUID());
                 contactPd.put("CUSTOMERMANAGEMENT_ID", customermanagement_id);
                 contactPd.put("CREATOR", Jurisdiction.getUSER_ID()); // 设置创建人ID
                 contactPd.put("CREATORNAME", Jurisdiction.getName()); // 设置创建人姓名

src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java

@@ -38,6 +38,8 @@ public class TrafficSecurityLocationManagementController extends BaseController
         pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id
         pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名
         pd.put("LOCATIONMANAGEMENT_ID", locationmanagement_id); // 主键
+        pd.put("LOCATIONNAME_ID", this.get32UUID());
+        pd.put("ADDRESSDETAILS_ID", this.get32UUID());
         pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
         pd.put("ISDELETE", "0");
 

src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java

@@ -4,10 +4,7 @@ import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.service.comprehensive.TrafficSecurityWaybillRegistrationService;
-import com.zcloud.util.Const;
-import com.zcloud.util.DateUtil;
-import com.zcloud.util.Jurisdiction;
-import com.zcloud.util.Tools;
+import com.zcloud.util.*;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -16,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -82,6 +80,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
         pd.put("WAYBILLREGISTRATION_ID", waybillregistrationId); // 主键
         pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
         pd.put("ISDELETE", "0");
+
         Date shippingDate = DateUtil.fomatDate(pd.getString("SHIPPINGDATE"));
         if (shippingDate != null && shippingDate.after(new Date())) {
             pd.put("WAYBILLSTATUS", "1");

src/main/java/com/zcloud/util/InitPageDataUtil.java

@@ -32,7 +32,7 @@ public class InitPageDataUtil {
         pd.put("OPERATOR", Jurisdiction.getUSER_ID());    //修改人
         pd.put("OPERATTIME", DateUtil.date2Str(new Date()));    //修改时间
         pd.put("ISDELETE", "0");    //是否删除(0:有效 1：删除)
-        pd.put(PRIMARY_KEY, UuidUtil.get32UUID());    //是否删除(0:有效 1：删除)
+        pd.put(PRIMARY_KEY, UuidUtil.get32UUID());
     }
 
     /**

src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml

@@ -26,6 +26,8 @@
         f.CREATETIME,
         f.OPERATOR,
         f.OPERATORNAME,
+        f.CONTACT_ID,
+        f.CUSTOMERADDRESS_ID,
         f.OPERATTIME
     </sql>
 
@@ -45,6 +47,8 @@
         CREATETIME,
         OPERATOR,
         OPERATORNAME,
+        CONTACT_ID,
+        CUSTOMERADDRESS_ID,
         OPERATTIME
     </sql>
 
@@ -64,6 +68,8 @@
         #{CREATETIME},
         #{OPERATOR},
         #{OPERATORNAME},
+        #{CONTACT_ID},
+        #{CUSTOMERADDRESS_ID},
         #{OPERATTIME}
     </sql>
 

src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml

@@ -25,6 +25,7 @@
         f.CREATETIME,
         f.OPERATOR,
         f.OPERATORNAME,
+        f.CUSTOMERNAME_ID,
         f.OPERATTIME
     </sql>
 
@@ -43,6 +44,7 @@
         CREATETIME,
         OPERATOR,
         OPERATORNAME,
+        CUSTOMERNAME_ID,
         OPERATTIME
     </sql>
 
@@ -61,6 +63,7 @@
         #{CREATETIME},
         #{OPERATOR},
         #{OPERATORNAME},
+        #{CUSTOMERNAME_ID},
         #{OPERATTIME}
     </sql>
 
@@ -93,8 +96,10 @@
         f.*,
         i.CORP_NAME,
         u.CONTACT,
+        u.CONTACT_ID,
         u.CONTACTPHONE,
-        u.CUSTOMERADDRESS
+        u.CUSTOMERADDRESS,
+        u.CUSTOMERADDRESS_ID
         from
         <include refid="tableName"></include> f
         left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID

src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml

@@ -29,6 +29,8 @@
         f.OPERATORNAME,
         f.LONGITUDE,
         f.LATITUDE,
+        f.LOCATIONNAME_ID,
+        f.ADDRESSDETAILS_ID,
         f.OPERATTIME
     </sql>
 
@@ -51,6 +53,8 @@
         OPERATORNAME,
         LONGITUDE,
         LATITUDE,
+        LOCATIONNAME_ID,
+        ADDRESSDETAILS_ID,
         OPERATTIME
     </sql>
 
@@ -73,6 +77,8 @@
         #{OPERATORNAME},
         #{LONGITUDE},
         #{LATITUDE},
+        #{LOCATIONNAME_ID},
+        #{ADDRESSDETAILS_ID},
         #{OPERATTIME}
     </sql>
 

src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml

@@ -159,13 +159,17 @@
         i.CORP_NAME,
         u.NAME,
         b.LOCATIONNAME AS ORIGIN_NAME,
-        b2.LOCATIONNAME AS DESTINATION_NAME
+        b2.LOCATIONNAME AS DESTINATION_NAME,
+        c.CUSTOMERNAME AS CLIENT_NAME,
+        c2.CUSTOMERNAME AS CONFIRMER_NAME
         from
         <include refid="tableName"></include> f
         left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID
         left join sys_user u on f.PRACTITIONER = u.USER_ID
-        left join bus_traffic_location_management b on f.ORIGIN = b.LOCATIONMANAGEMENT_ID
-        left join bus_traffic_location_management b2 on f.DESTINATION = b2.LOCATIONMANAGEMENT_ID
+        left join bus_traffic_location_management b on f.ORIGIN = b.LOCATIONNAME_ID
+        left join bus_traffic_location_management b2 on f.DESTINATION = b2.LOCATIONNAME_ID
+        left join bus_traffic_customer_management c on f.CLIENT = c.CUSTOMERNAME_ID
+        left join bus_traffic_customer_management c2 on f.CONFIRMER = c2.CUSTOMERNAME_ID
         where f.ISDELETE = '0'
         <if test="pd.WAYBILLSTATUS != null and pd.WAYBILLSTATUS != ''"><!-- 关键词检索-运单状态 -->
             and f.WAYBILLSTATUS = #{pd.WAYBILLSTATUS}

src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml

@@ -10,58 +10,58 @@
 
     <!-- 字段 -->
     <sql id="Field">
-INSPECTANNUALLY_ID,
-CORPINFO_ID,
-NUM,
-VEHICLE_MODEL,
-VEHICLE,
-CAR_OWNERS,
-TELEPHONE,
-REGISTRANT,
-PROCESSING_DATE,
-ANNUAL_INSPECTION_CYCLE,
-DUE_DATE,
-INSPECTFEES,
-ACTUAL_COLLECTION,
-ADDRESS,
-REMINDER_DAYS,
-REMINDER_DATE,
-REMINDER_STATUS,
-INSPECTINFO,
-NOTES,
-ARCHIVES_TYPE,
-ISDELETE,
-CREATOR,
-CREATORNAME,
-CREATTIME
+        INSPECTANNUALLY_ID,
+        CORPINFO_ID,
+        NUM,
+        VEHICLE_MODEL,
+        VEHICLE,
+        CAR_OWNERS,
+        TELEPHONE,
+        REGISTRANT,
+        PROCESSING_DATE,
+        ANNUAL_INSPECTION_CYCLE,
+        DUE_DATE,
+        INSPECTFEES,
+        ACTUAL_COLLECTION,
+        ADDRESS,
+        REMINDER_DAYS,
+        REMINDER_DATE,
+        REMINDER_STATUS,
+        INSPECTINFO,
+        NOTES,
+        ARCHIVES_TYPE,
+        ISDELETE,
+        CREATOR,
+        CREATORNAME,
+        CREATTIME
 	</sql>
 
     <!-- 字段值 -->
     <sql id="FieldValue">
-#{INSPECTANNUALLY_ID},
-#{CORPINFO_ID},
-#{NUM},
-#{VEHICLE_MODEL},
-#{VEHICLE},
-#{CAR_OWNERS},
-#{TELEPHONE},
-#{REGISTRANT},
-#{PROCESSING_DATE},
-#{ANNUAL_INSPECTION_CYCLE},
-#{DUE_DATE},
-#{INSPECTFEES},
-#{ACTUAL_COLLECTION},
-#{ADDRESS},
-#{REMINDER_DAYS},
-#{REMINDER_DATE},
-#{REMINDER_STATUS},
-#{INSPECTINFO},
-#{NOTES},
-#{ARCHIVES_TYPE},
-#{ISDELETE},
-#{CREATOR},
-#{CREATORNAME},
-#{CREATTIME}
+        #{INSPECTANNUALLY_ID},
+        #{CORPINFO_ID},
+        #{NUM},
+        #{VEHICLE_MODEL},
+        #{VEHICLE},
+        #{CAR_OWNERS},
+        #{TELEPHONE},
+        #{REGISTRANT},
+        #{PROCESSING_DATE},
+        #{ANNUAL_INSPECTION_CYCLE},
+        #{DUE_DATE},
+        #{INSPECTFEES},
+        #{ACTUAL_COLLECTION},
+        #{ADDRESS},
+        #{REMINDER_DAYS},
+        #{REMINDER_DATE},
+        #{REMINDER_STATUS},
+        #{INSPECTINFO},
+        #{NOTES},
+        #{ARCHIVES_TYPE},
+        #{ISDELETE},
+        #{CREATOR},
+        #{CREATORNAME},
+        #{CREATTIME}
 	</sql>
 
     <!-- 新增-->
@@ -179,13 +179,13 @@ CREATTIME
      -->
     <select id="datalistPage" parameterType="page" resultType="pd">
         select
+        b.NAME,
         f.*,
         case when f.DUE_DATE &lt; NOW() then 0 else 1 end as DUE_DATE_TYPE,
-        v1.PLATE_NUMBER,
-        (SELECT sd.NAME FROM sys_dictionaries sd where sd.DICTIONARIES_ID=f.ANNUAL_INSPECTION_CYCLE) as ANNUAL_INSPECTION_CYCLE_NAME
+        v1.PLATE_NUMBER
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
+        left join sys_dictionaries b on f.ANNUAL_INSPECTION_CYCLE = b.DICTIONARIES_ID
         INNER JOIN v_traffic v1 on f.VEHICLE=v1.ID
         where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
         <if test="pd.PLATE_NUMBER != null and pd.PLATE_NUMBER != ''">
@@ -212,5 +212,4 @@ CREATTIME
         ORDER BY f.CREATTIME DESC
     </select>
 
-
 </mapper>

src/main/resources/mybatis/datasource/operations/OperationsMapper.xml

@@ -10,53 +10,88 @@
 
     <!-- 字段 -->
     <sql id="Field">
-OPERATIONS_ID,
-CORPINFO_ID,
-NUM,
-VEHICLE_MODEL,
-VEHICLE,
-CAR_OWNERS,
-TELEPHONE,
-REGISTRANT,
-PROCESSING_DATE,
-CYCLE,
-DUE_DATE,
-REMINDER_DAYS,
-REMINDER_DATE,
-REMINDER_STATUS,
-OPERATIONSINFO,
-NOTES,
-ARCHIVES_TYPE,
-ISDELETE,
-CREATOR,
-CREATORNAME,
-CREATTIME
-	</sql>
+        OPERATIONS_ID,
+        CORPINFO_ID,
+        INDUSTRY_TYPE,
+        INDUSTRY_TYPE_TREE,
+        INDUSTRY_TYPE_NAMES,
+        OPER_CORP,
+        VEHICLE_MODEL,
+        VEHICLE,
+        BASICINFO_LICENSE_PLATE,
+        BASICINFO_VIN,
+        BASICINFO_VEHICLETYPE,
+        BASICINFO_CAR_OWNERS,
+        BASICINFO_CARPHONE,
+        BASICINFO_INITIAL_REGISTRATION_DATE,
+        BASICINFO_PROVINCE,
+        BASICINFO_CITY,
+        BASICINFO_COUNTY,
+        CAR_OWNERS,
+        TELEPHONE,
+        REGISTRANT,
+        PROCESSING_DATE,
+        CYCLE,
+        DUE_DATE,
+        REMINDER_DAYS,
+        REMINDER_DATE,
+        REMINDER_STATUS,
+        OPERATIONSINFO,
+        NOTES,
+        ISDELETE,
+        CREATOR,
+        CREATORNAME,
+        CREATTIME,
+        OPERATOR,
+        OPERATORNAME,
+        OPERATTIME,
+        DELETEOR,
+        DELETEORNAME,
+        DELETTIME
+    </sql>
 
     <!-- 字段值 -->
     <sql id="FieldValue">
-#{OPERATIONS_ID},
-#{CORPINFO_ID},
-#{NUM},
-#{VEHICLE_MODEL},
-#{VEHICLE},
-#{CAR_OWNERS},
-#{TELEPHONE},
-#{REGISTRANT},
-#{PROCESSING_DATE},
-#{CYCLE},
-#{DUE_DATE},
-#{REMINDER_DAYS},
-#{REMINDER_DATE},
-#{REMINDER_STATUS},
-#{OPERATIONSINFO},
-#{NOTES},
-#{ARCHIVES_TYPE},
-#{ISDELETE},
-#{CREATOR},
-#{CREATORNAME},
-#{CREATTIME}
-	</sql>
+        #{OPERATIONS_ID},
+        #{CORPINFO_ID},
+        #{INDUSTRY_TYPE},
+        #{INDUSTRY_TYPE_TREE},
+        #{INDUSTRY_TYPE_NAMES},
+        #{OPER_CORP},
+        #{VEHICLE_MODEL},
+        #{VEHICLE},
+        #{BASICINFO_LICENSE_PLATE},
+        #{BASICINFO_VIN},
+        #{BASICINFO_VEHICLETYPE},
+        #{BASICINFO_CAR_OWNERS},
+        #{BASICINFO_CARPHONE},
+        #{BASICINFO_INITIAL_REGISTRATION_DATE},
+        #{BASICINFO_PROVINCE},
+        #{BASICINFO_CITY},
+        #{BASICINFO_COUNTY},
+        #{CAR_OWNERS},
+        #{TELEPHONE},
+        #{REGISTRANT},
+        #{PROCESSING_DATE},
+        #{CYCLE},
+        #{DUE_DATE},
+        #{REMINDER_DAYS},
+        #{REMINDER_DATE},
+        #{REMINDER_STATUS},
+        #{OPERATIONSINFO},
+        #{NOTES},
+        #{ISDELETE},
+        #{CREATOR},
+        #{CREATORNAME},
+        #{CREATTIME},
+        #{OPERATOR},
+        #{OPERATORNAME},
+        #{OPERATTIME},
+        #{DELETEOR},
+        #{DELETEORNAME},
+        #{DELETTIME}
+    </sql>
+
 
     <!-- 新增-->
     <insert id="save" parameterType="pd">