Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java

@@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.logs.LogAnno;
+import com.zcloud.service.assignedManage.AssignedManageService;
 import com.zcloud.service.operatingvehicles.OperatingVehiclesService;
 import com.zcloud.util.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +52,7 @@ public class OperatingVehiclesController extends BaseController {
         pd.put("OPERATOR", Jurisdiction.getUSER_ID());	//修改人id
         pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字
         pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
+        pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         if (null != headstockFile && !headstockFile.isEmpty()) {
             String  ffile = DateUtil.getDays();
             //本地
@@ -98,6 +100,10 @@ public class OperatingVehiclesController extends BaseController {
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
+        pd.put("DELETOR", Jurisdiction.getUSER_ID());
+        pd.put("DELETORNAME", Jurisdiction.getUsername());
+        pd.put("DELETTIME", DateUtil.date2Str(new Date()));
+        operatingVehiclesService.delete(pd);
         map.put("result", errInfo);				//返回结果
         return map;
     }
@@ -186,6 +192,7 @@ public class OperatingVehiclesController extends BaseController {
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);
+        System.out.println();
         return map;
     }
 }

src/main/java/com/zcloud/controller/system/DictionariesController.java

@@ -1030,4 +1030,27 @@ public class DictionariesController extends BaseController {
         return map;
     }
 
+    @RequestMapping(value = "/getVehicleType")
+    @ResponseBody
+    public Object getVehicleType() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listgetVehicleType(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
 }

src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java

@@ -154,4 +154,6 @@ public interface DictionariesMapper {
 	List<Dictionaries> listgetAssignedVehicleModel(String parentId);
 
     List<Dictionaries> listgetAssignedVehicle(String parentId);
+
+    List<Dictionaries> listgetVehicleType(String parentId);
 }

src/main/java/com/zcloud/service/system/DictionariesService.java

@@ -199,4 +199,6 @@ public interface DictionariesService {
 	List<Dictionaries> listgetAssignedVehicleModel(String parentId);
 
     List<Dictionaries> listgetAssignedVehicle(String parentId);
+
+    List<Dictionaries> listgetVehicleType(String parentId);
 }

src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java

@@ -496,4 +496,9 @@ public class DictionariesServiceImpl implements DictionariesService {
 	public List<Dictionaries> listgetAssignedVehicle(String parentId) {
 		return dictionariesMapper.listgetAssignedVehicle(parentId);
 	}
+
+	@Override
+	public List<Dictionaries> listgetVehicleType(String parentId) {
+		return dictionariesMapper.listgetVehicleType(parentId);
+	}
 }

src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml

@@ -24,6 +24,7 @@
 		f.VEHICLE_TYPE,
 		f.FIRSTSHOW_DATE,
 		f.EXPIRE_DATE,
+		f.VEHICLE_EQUIPMENT,
 		f.BELONGING_DEPARTMENT,
 		f.TRANSPORT_ENTERPRISES,
 		f.TRANSPORT_TYPE,
@@ -48,6 +49,7 @@
 		f.VOUCH_NUMBERLOAD,
 		f.VOUCH_PAYLOAD,
 		f.RACTIONMASS_QUALITY,
+		f.HOME_TERRITORY,
 		f.REMARK,
 		f.HEADSTOCK_PHOTO,
 		f.DRIVINGLICENSE_PHOTO,
@@ -64,7 +66,8 @@
 		f.OPERATTIME,
 		f.DELETOR,
 		f.DELETORNAME,
-		f.DELETTIME
+		f.DELETTIME,
+		f.CORPINFO_ID
 	</sql>
 
 	<!-- 字段用于新增 -->
@@ -79,6 +82,7 @@
 		VEHICLE_TYPE,
 		FIRSTSHOW_DATE,
 		EXPIRE_DATE,
+		VEHICLE_EQUIPMENT,
 		BELONGING_DEPARTMENT,
 		TRANSPORT_ENTERPRISES,
 		TRANSPORT_TYPE,
@@ -103,6 +107,7 @@
 		VOUCH_NUMBERLOAD,
 		VOUCH_PAYLOAD,
 		RACTIONMASS_QUALITY,
+		HOME_TERRITORY,
 		REMARK,
 		HEADSTOCK_PHOTO,
 		DRIVINGLICENSE_PHOTO,
@@ -119,7 +124,8 @@
 		OPERATTIME,
 		DELETOR,
 		DELETORNAME,
-		DELETTIME
+		DELETTIME,
+		CORPINFO_ID
 	</sql>
 
 	<!-- 字段值 -->
@@ -134,6 +140,7 @@
 		#{VEHICLE_TYPE},
 		#{FIRSTSHOW_DATE},
 		#{EXPIRE_DATE},
+		#{VEHICLE_EQUIPMENT},
 		#{BELONGING_DEPARTMENT},
 		#{TRANSPORT_ENTERPRISES},
 		#{TRANSPORT_TYPE},
@@ -158,6 +165,7 @@
 		#{VOUCH_NUMBERLOAD},
 		#{VOUCH_PAYLOAD},
 		#{RACTIONMASS_QUALITY},
+		#{HOME_TERRITORY},
 		#{REMARK},
 		#{HEADSTOCK_PHOTO},
 		#{DRIVINGLICENSE_PHOTO},
@@ -175,6 +183,7 @@
 		#{DELETOR},
 		#{DELETORNAME},
 		#{DELETTIME}
+		#{CORPINFO_ID}
 	</sql>
 
 	<!-- 新增-->
@@ -213,6 +222,7 @@
 		VEHICLE_TYPE = #{VEHICLE_TYPE},
 		FIRSTSHOW_DATE = #{FIRSTSHOW_DATE},
 		EXPIRE_DATE = #{EXPIRE_DATE},
+		VEHICLE_EQUIPMENT = #{VEHICLE_EQUIPMENT},
 		BELONGING_DEPARTMENT = #{BELONGING_DEPARTMENT},
 		TRANSPORT_ENTERPRISES = #{TRANSPORT_ENTERPRISES},
 		TRANSPORT_TYPE = #{TRANSPORT_TYPE},
@@ -236,6 +246,7 @@
 		VOUCH_TOTALMASS = #{VOUCH_TOTALMASS},
 		VOUCH_NUMBERLOAD = #{VOUCH_NUMBERLOAD},
 		VOUCH_PAYLOAD = #{VOUCH_PAYLOAD},
+		HOME_TERRITORY = #{HOME_TERRITORY},
 		RACTIONMASS_QUALITY = #{RACTIONMASS_QUALITY},
 		REMARK = #{REMARK},
 		HEADSTOCK_PHOTO = #{HEADSTOCK_PHOTO},
@@ -253,7 +264,8 @@
 		OPERATTIME = #{OPERATTIME},
 		DELETOR = #{DELETOR},
 		DELETORNAME = #{DELETORNAME},
-		DELETTIME = #{DELETTIME}
+		DELETTIME = #{DELETTIME},
+		CORPINFO_ID = #{CORPINFO_ID}
 		where
 			OPERATING_ID = #{OPERATING_ID}
 	</update>
@@ -451,7 +463,7 @@
 			and f.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%')
 		</if>
 		<if test="pd.VEHICLE_COLOR != null and pd.VEHICLE_COLOR != ''"><!-- 关键词检索 -->
-			and f.VEHICLE_COLOR = #{pd.VEHICLE_COLOR}
+			and f.VEHICLE_COLOR LIKE CONCAT(CONCAT('%', #{pd.VEHICLE_COLOR}),'%')
 		</if>
 		<if test="pd.FRAMES_NUMBER != null and pd.FRAMES_NUMBER != ''"><!-- 关键词检索 -->
 			and f.FRAMES_NUMBER LIKE CONCAT(CONCAT('%', #{pd.FRAMES_NUMBER}),'%')
@@ -462,8 +474,8 @@
 		<if test="pd.BELONGING_DEPARTMENT != null and pd.BELONGING_DEPARTMENT != ''"><!-- 关键词检索 -->
 			and f.BELONGING_DEPARTMENT LIKE CONCAT(CONCAT('%', #{pd.BELONGING_DEPARTMENT}),'%')
 		</if>
-		<if test="pd.TRANSPORT_ENTERPRISES != null and pd.TRANSPORT_ENTERPRISES != ''"><!-- 关键词检索 -->
+		<if test="pd.TRANSPORT_TYPE != null and pd.TRANSPORT_TYPE != ''"><!-- 关键词检索 -->
-			and f.TRANSPORT_ENTERPRISES = #{pd.TRANSPORT_ENTERPRISES}
+			and f.TRANSPORT_TYPE = #{pd.TRANSPORT_TYPE}
 		</if>
 		<if test="pd.NETWORK_STATUS != null and pd.NETWORK_STATUS != ''"><!-- 关键词检索 -->
 			and f.NETWORK_STATUS = #{pd.NETWORK_STATUS}

src/main/resources/mybatis/datasource/system/DictionariesMapper.xml

@@ -437,5 +437,14 @@
 		PARENT_ID = #{parentId} order by ORDER_BY
 	</select>
 
+	<select id="listgetVehicleType" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
 
 </mapper>