wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

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

# Conflicts:
#	src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java
dev
WenShiJun 2024-03-28 18:33:55 +08:00
parent 4763b042a0 7fd34a34bb
commit b47e7d647b
14 changed files with 188 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java
View File

@ -6,11 +6,14 @@ import com.zcloud.entity.PageData;
import com.zcloud.logs.LogAnno;
import com.zcloud.service.assignedManage.AssignedManageService;
import com.zcloud.service.freighttrailer.FreightTrailerService;
import com.zcloud.service.inspectAnnually.InspectAnnuallyService;
import com.zcloud.service.operatingvehicles.OperatingVehiclesService;
import com.zcloud.service.scrapManage.ScrapManageService;
import com.zcloud.service.system.ImgFilesService;
import com.zcloud.service.taxationManage.TaxationManageService;
import com.zcloud.util.*;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
@ -45,6 +48,12 @@ public class FreighttTrailerController extends BaseController {
@Autowired
private AssignedManageService assignedManageService;
@Autowired
private OperatingVehiclesService operatingVehiclesService;
@Autowired
private InspectAnnuallyService inspectAnnuallyService;
/**
* 新增
*
@ -110,6 +119,7 @@ public class FreighttTrailerController extends BaseController {
scrapAddData.put("CORPINFO_ID", findPageData.get("CORPINFO_ID"));
scrapAddData.put("SCRAP_VEHICLE", findPageData.get("PLATE_NUMBER"));
scrapAddData.put("ISDELETE", "0");
scrapAddData.put("SCRAPFLAG", "1");
scrapManageService.save(scrapAddData);
}
pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id
@ -516,20 +526,73 @@ public class FreighttTrailerController extends BaseController {
// @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR)
@ResponseBody
@LogAnno(menuType = "基础信息管理", menuServer = "营运车辆", instructionsOperate = "营运车辆", instructionsType = "列表")
public Object vehicleList() throws Exception {
public Object vehicleList(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
List<PageData> list = freightTrailerService.vehicleList(pd); //列出Question列表
if(!StringUtils.isEmpty(pd.getString("TRAFFIC_TYPE")) && pd.getString("TRAFFIC_TYPE").equals("1")) {
// 营运车辆
List<PageData> operatingList = operatingVehiclesService.operationVehicleList(pd.getString("CORPINFO_ID"));
page.setPd(pd);
List<PageData> insAnnually = inspectAnnuallyService.annuallyList(page);
for (int i = 0; i < insAnnually.size(); i++) {
for (int j = 0; j < operatingList.size(); j++) {
if(operatingList.get(j).get("OPERATING_ID").equals(insAnnually.get(i).get("VEHICLE"))) {
operatingList.remove(j);
}
}
}
if(pd.containsKey("ID")){
pd.put("OPERATING_ID", pd.getString("ID"));
pd.put("FOREIGN_KEY", pd.getString("OPERATING_ID"));
pd.put("TYPE",121);
List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
map.put("drivingLicenseImgs", drivingLicenseImgs);
}
operatingList.forEach(operating -> {
operating.put("ID", operating.getString("OPERATING_ID"));
});
map.put("list", operatingList);
map.put("result", errInfo);
return map;
}
if("2".equals(pd.getString("TRAFFIC_TYPE"))) {
// 货运挂车
List<PageData> freightList = freightTrailerService.trailerList(pd.getString("CORPINFO_ID"));
page.setPd(pd);
List<PageData> insAnnually = inspectAnnuallyService.annuallyList(page);
for (int i = 0; i < insAnnually.size(); i++) {
for (int j = 0; j < freightList.size(); j++) {
if(freightList.get(j).get("FREIGHTTRAILER_ID").equals(insAnnually.get(i).get("VEHICLE"))) {
freightList.remove(j);
}
}
}
if(pd.containsKey("ID")){
pd.put("FREIGHTTRAILER_ID", pd.getString("ID"));
pd.put("FOREIGN_KEY", pd.getString("FREIGHTTRAILER_ID"));
pd.put("TYPE",121);
List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
map.put("drivingLicenseImgs", drivingLicenseImgs);
}
freightList.forEach(freight -> {
freight.put("ID", freight.getString("FREIGHTTRAILER_ID"));
});
map.put("list", freightList);
map.put("result", errInfo);
return map;
}
List<PageData> resData = freightTrailerService.vehicleList(pd);
if(pd.containsKey("ID")){
pd.put("FOREIGN_KEY", pd.getString("ID"));
pd.put("TYPE",121);
List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
map.put("drivingLicenseImgs", drivingLicenseImgs);
}
map.put("list", list);
map.put("list", resData);
map.put("result", errInfo);
return map;
}

45
src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java
View File

@ -4,7 +4,9 @@ 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.freighttrailer.FreightTrailerService;
import com.zcloud.service.inspectAnnually.InspectAnnuallyService;
import com.zcloud.service.operatingvehicles.OperatingVehiclesService;
import com.zcloud.service.system.ImgFilesService;
import com.zcloud.util.DateUtil;
import com.zcloud.util.Jurisdiction;
@ -30,6 +32,13 @@ public class InspectAnnuallyController extends BaseController {
@Autowired
private ImgFilesService imgfilesService;
@Autowired
private OperatingVehiclesService operatingVehiclesService;
@Autowired
private FreightTrailerService freightTrailerService;
/**
* 新增
*
@ -171,6 +180,23 @@ public class InspectAnnuallyController extends BaseController {
pd = this.getPageData();
pd = inspectAnnuallyService.findById(pd); //根据ID读取
if("1".equals(pd.getString("VEHICLE_MODEL"))) {
PageData opearting = new PageData();
opearting.put("OPERATING_ID", pd.get("VEHICLE"));
opearting.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
PageData pageData = operatingVehiclesService.findById(opearting);
pd.put("VEHICLE_BRAND", pageData.get("VEHICLE_BRAND"));
pd.put("VEHICLE_TYPE", pageData.get("VEHICLE_MODEL"));
pd.put("PLATE_NUMBER", pageData.get("PLATE_NUMBER"));
}else{
PageData freight = new PageData();
freight.put("FREIGHTTRAILER_ID", pd.get("VEHICLE"));
freight.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
PageData pageData = freightTrailerService.findById(freight);
pd.put("VEHICLE_BRAND", pageData.get("TRAILER_BRAND"));
pd.put("VEHICLE_TYPE", pageData.get("TRAILER_MODEL"));
}
pd.put("FOREIGN_KEY", pd.getString("INSPECTANNUALLY_ID"));
pd.put("TYPE",124);
List<PageData> inspectinfoImgs = imgfilesService.listAll(pd);//年检资料图片
@ -182,4 +208,23 @@ public class InspectAnnuallyController extends BaseController {
}
@RequestMapping(value = "/annuallyList")
// @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR)
@ResponseBody
@LogAnno(menuType = "机务档案", menuServer = "年检管理", instructionsOperate = "年检管理", instructionsType = "列表")
public Object annuallyList(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
page.setPd(pd);
List<PageData> varList = inspectAnnuallyService.annuallyList(page); //列出Question列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
}

20
src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java
View File

@ -159,8 +159,8 @@ public class OperatingVehiclesController extends BaseController {
pd.put("FOREIGN_KEY", pd.getString("OPERATING_ID"));
pd.put("TYPE",130);
List<PageData> headstockphoto = imgfilesService.listAll(pd);//车头照片
pd.put("TYPE",131);
List<PageData> drivinglicensephoto = imgfilesService.listAll(pd);//行驶证照片
pd.put("TYPE",121);
List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
pd.put("TYPE",132);
List<PageData> operatingcertificatephoto = imgfilesService.listAll(pd);//运营证照片
@ -182,7 +182,7 @@ public class OperatingVehiclesController extends BaseController {
map.put("pd", pd);
map.put("headstockphoto", headstockphoto);
map.put("drivinglicensephoto", drivinglicensephoto);
map.put("drivinglicensephoto", drivingLicenseImgs);
map.put("operatingcertificatephoto", operatingcertificatephoto);
map.put("result", errInfo);
return map;
@ -244,6 +244,20 @@ public class OperatingVehiclesController extends BaseController {
return map;
}
@RequestMapping(value = "/setOperationsScrapStatus")
@ResponseBody
public Object setOperationsScrapStatus() throws Exception {
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
pd = operatingVehiclesService.setScrapStatus(pd);
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
@RequestMapping(value = "/corpList")
@ResponseBody
public Object corpList() throws Exception {

2
src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java
View File

@ -49,7 +49,7 @@ public class ScrapManageController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("SCRAP_ID", this.get32UUID()); //车船税主键
pd.put("SCRAP_ID", this.get32UUID()); //报废主键
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id

1
src/main/java/com/zcloud/mapper/datasource/inspectAnnually/InspectAnnuallyMapper.java
View File

@ -60,5 +60,6 @@ public interface InspectAnnuallyMapper {
PageData findById(PageData pd);
List<PageData> annuallyList(Page page);
}

2
src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java
View File

@ -39,4 +39,6 @@ public interface OperatingVehiclesMapper {
List<PageData> corpList(String corpId);
PageData findByfindByPlateNumber(PageData pd);
PageData setScrapStatus(PageData pd);
}

1
src/main/java/com/zcloud/service/inspectAnnually/InspectAnnuallyService.java
View File

@ -60,5 +60,6 @@ public interface InspectAnnuallyService {
public PageData findById(PageData pd) throws Exception;
List<PageData> annuallyList(Page page);
}

4
src/main/java/com/zcloud/service/inspectAnnually/impl/InspectAnnuallyServiceImpl.java
View File

@ -82,6 +82,10 @@ public class InspectAnnuallyServiceImpl implements InspectAnnuallyService {
return inspectAnnuallyMapper.findById(pd);
}
@Override
public List<PageData> annuallyList(Page page) {
return inspectAnnuallyMapper.annuallyList(page);
}
}

2
src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java
View File

@ -39,4 +39,6 @@ public interface OperatingVehiclesService {
List<PageData> corpList(String corpId);
PageData findByfindByPlateNumber(PageData pd);
PageData setScrapStatus(PageData pd);
}

5
src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java
View File

@ -56,4 +56,9 @@ public class OperatingVehiclesServiceImpl implements OperatingVehiclesService {
public PageData findByfindByPlateNumber(PageData pd) {
return operatingVehiclesMapper.findByfindByPlateNumber(pd);
}
@Override
public PageData setScrapStatus(PageData pd) {
return operatingVehiclesMapper.setScrapStatus(pd);
}
}

4
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml
View File

@ -346,6 +346,10 @@
<if test="pd.ACCIDENTDATE != null and pd.ACCIDENTDATE != ''"><!-- 检索-处罚时间 -->
and f.ACCIDENTDATE = #{pd.ACCIDENTDATE}
</if>
<if test="pd.ACCIDENTDATE != null and pd.ACCIDENTDATE != ''"><!-- 检索-处罚时间 -->
and f.ACCIDENTDATE = #{pd.ACCIDENTDATE}
</if>
ORDER BY OPERATTIME DESC
ORDER BY f.CREATETIME DESC
</select>

10
src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml
View File

@ -212,4 +212,14 @@
ORDER BY f.CREATTIME DESC
</select>
<select id="annuallyList" parameterType="page" resultType="pd">
select
*
from
<include refid="tableName"></include> f
where
f.ISDELETE = '0'
AND
f.CORPINFO_ID = #{pd.CORPINFO_ID}
</select>
</mapper>

29
src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml
View File

@ -67,7 +67,9 @@
f.OPERATTIME,
f.DELETOR,
f.DELETORNAME,
f.DELETTIME
f.DELETTIME,
f.ISSCRAP,
f.ISASSIGNED
</sql>
<!-- 字段用于新增 -->
@ -125,7 +127,9 @@
OPERATTIME,
DELETOR,
DELETORNAME,
DELETTIME
DELETTIME,
ISSCRAP,
ISASSIGNED
</sql>
<!-- 字段值 -->
@ -183,7 +187,9 @@
#{OPERATTIME},
#{DELETOR},
#{DELETORNAME},
#{DELETTIME}
#{DELETTIME},
#{ISSCRAP},
#{ISASSIGNED},
</sql>
<!-- 新增-->
@ -202,7 +208,7 @@
update
<include refid="tableName"></include>
set
ISDELETE = '1'
ISDELETE = '1',ISSCRAP = '1'
where
OPERATING_ID = #{OPERATING_ID}
</delete>
@ -265,7 +271,9 @@
DELETOR = #{DELETOR},
DELETORNAME = #{DELETORNAME},
DELETTIME = #{DELETTIME},
CORPINFO_ID = #{CORPINFO_ID}
CORPINFO_ID = #{CORPINFO_ID},
ISSCRAP = #{ISSCRAP},
ISASSIGNED = #{ISASSIGNED}
where
OPERATING_ID = #{OPERATING_ID}
</update>
@ -282,6 +290,17 @@
f.CORPINFO_ID = #{CORPINFO_ID}
</select>
<update id="setScrapStatus" parameterType="pd">
update
<include refid="tableName"></include>
set
ISSCRAP = '1'
where
OPERATING_ID = #{OPERATING_ID}
and
CORPINFO_ID = #{CORPINFO_ID}
</update>
<!-- 通过ID获取数据 -->
<select id="findByfindByPlateNumber" parameterType="pd" resultType="pd">

9
src/main/resources/mybatis/datasource/scrapManage/ScrapManage.xml
View File

@ -46,7 +46,8 @@
f.OPERATTIME,
f.DELETOR,
f.DELETORNAME,
f.DELETTIME
f.DELETTIME,
f.SCRAPFLAG
</sql>
<!-- 字段用于新增 -->
@ -83,7 +84,8 @@
OPERATTIME,
DELETOR,
DELETORNAME,
DELETTIME
DELETTIME,
SCRAPFLAG
</sql>
<!-- 字段值 -->
@ -120,7 +122,8 @@
#{OPERATTIME},
#{DELETOR},
#{DELETORNAME},
#{DELETTIME}
#{DELETTIME},
#{SCRAPFLAG}
</sql>
<!-- 新增-->