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

Compare commits

base: wangpeng:56e76848cc8bddcc4c3761154e1d46692a278460
Branches Tags
wangpeng:dev
wangpeng:dev-new
wangpeng:master
..
compare: wangpeng:4f973b0e4b98db48672cbce30c42efc206aa644e
Branches Tags
wangpeng:dev
wangpeng:dev-new
wangpeng:master

No commits in common. "56e76848cc8bddcc4c3761154e1d46692a278460" and "4f973b0e4b98db48672cbce30c42efc206aa644e" have entirely different histories.
56e76848cc ... 4f973b0e4b

16 changed files with 20 additions and 215 deletions
Show Stats Expand all files Collapse all files

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

@ -413,7 +413,6 @@ public class FreighttTrailerController extends BaseController {
return map;
}
/**导出到excel
* @param
* @throws Exception

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

@ -10,16 +10,16 @@ import com.zcloud.service.operatingvehicles.OperatingVehiclesService;
import com.zcloud.service.system.ImgFilesService;
import com.zcloud.util.DateUtil;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.ObjectExcelView;
import com.zcloud.util.Tools;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import java.util.*;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 年检管理
@ -228,68 +228,5 @@ public class InspectAnnuallyController extends BaseController {
}
/**导出到excel
* @param
* @throws Exception
*/
@RequestMapping(value="/excel")
// // @RequiresPermissions("toExcel")
public ModelAndView exportExcel() throws Exception{
ModelAndView mv = new ModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
String[] ArrayDATA_IDS = DATA_IDS.split(",");
pd.put("ArrayDATA_IDS",ArrayDATA_IDS);
}
Map<String,Object> dataMap = new HashMap<String,Object>();
List<String> titles = new ArrayList<String>();
titles.add("年检车辆"); //1
titles.add("车架号"); //2
//titles.add("车身编号"); //3
titles.add("车辆类型"); //4
titles.add("运营证号"); //5
titles.add("归属部门"); //6
titles.add("车主"); //7
titles.add("车主电话"); //8
titles.add("初登日期"); //9
titles.add("发证日期"); //10
titles.add("到期日期"); //11
titles.add("车辆品牌"); //12
titles.add("车辆型号"); //13
titles.add("核定总质量"); //14
titles.add("核定载质量"); //15
//titles.add("容积"); //16
dataMap.put("titles", titles);
List<PageData> varOList = inspectAnnuallyService.listOut(pd);
List<PageData> varList = new ArrayList<PageData>();
for(int i=0;i<varOList.size();i++){
PageData vpd = new PageData();
vpd.put("var1", varOList.get(i).getString("VEHICLE"));//1
vpd.put("var2", varOList.get(i).getString("FRAMES_NUMBER"));//2
//vpd.put("var3", varOList.get(i).getString("VEHICLE_BODY_NUMBER"));//3
vpd.put("var4", varOList.get(i).getString("VEHICLE_TYPE"));//4
vpd.put("var5", varOList.get(i).getString("OPERATING_CERTIFICATE"));//5
vpd.put("var6", varOList.get(i).getString("BELONGING_DEPARTMENT"));//6
vpd.put("var7", varOList.get(i).getString("VEHICLEOWNER"));//7
vpd.put("var8", varOList.get(i).getString("VEHICLEOWNER_NUMBER"));//8
vpd.put("var9", varOList.get(i).getString("FIRSTSHOW_DATE"));//9
vpd.put("var10", varOList.get(i).getString("CERTIFICATE_DATE"));//10
vpd.put("var11", varOList.get(i).getString("EXPIRE_DATE"));//11
vpd.put("var12", varOList.get(i).getString("VEHICLE_BRAND"));//12
vpd.put("var13", varOList.get(i).getString("VEHICLE_MODEL"));//13
vpd.put("var14", varOList.get(i).getString("VOUCH_TOTALMASS"));//14
vpd.put("var15", varOList.get(i).getString("VOUCH_PAYLOAD"));//15
//vpd.put("var16", varOList.get(i).getString("VOLUME"));//16
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv,dataMap);
return mv;
}
}

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

@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
import java.util.*;
@ -287,70 +286,4 @@ public class OperatingVehiclesController extends BaseController {
return map;
}
/**导出到excel
* @param
* @throws Exception
*/
@RequestMapping(value="/excel")
// // @RequiresPermissions("toExcel")
public ModelAndView exportExcel() throws Exception{
ModelAndView mv = new ModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
String[] ArrayDATA_IDS = DATA_IDS.split(",");
pd.put("ArrayDATA_IDS",ArrayDATA_IDS);
}
Map<String,Object> dataMap = new HashMap<String,Object>();
List<String> titles = new ArrayList<String>();
titles.add("车牌号"); //1
titles.add("车架号"); //2
//titles.add("车身编号"); //3
titles.add("车辆类型"); //4
titles.add("运营证号"); //5
titles.add("归属部门"); //6
titles.add("车主"); //7
titles.add("车主电话"); //8
titles.add("初登日期"); //9
titles.add("发证日期"); //10
titles.add("到期日期"); //11
titles.add("车辆品牌"); //12
titles.add("车辆型号"); //13
titles.add("核定总质量"); //14
titles.add("核定载质量"); //15
//titles.add("容积"); //16
dataMap.put("titles", titles);
List<PageData> varOList = operatingVehiclesService.listOut(pd);
List<PageData> varList = new ArrayList<PageData>();
for(int i=0;i<varOList.size();i++){
PageData vpd = new PageData();
vpd.put("var1", varOList.get(i).getString("PLATE_NUMBER"));//1
vpd.put("var2", varOList.get(i).getString("FRAMES_NUMBER"));//2
//vpd.put("var3", varOList.get(i).getString("VEHICLE_BODY_NUMBER"));//3
vpd.put("var4", varOList.get(i).getString("VEHICLE_TYPE"));//4
vpd.put("var5", varOList.get(i).getString("OPERATING_CERTIFICATE"));//5
vpd.put("var6", varOList.get(i).getString("BELONGING_DEPARTMENT"));//6
vpd.put("var7", varOList.get(i).getString("VEHICLEOWNER"));//7
vpd.put("var8", varOList.get(i).getString("VEHICLEOWNER_NUMBER"));//8
vpd.put("var9", varOList.get(i).getString("FIRSTSHOW_DATE"));//9
vpd.put("var10", varOList.get(i).getString("CERTIFICATE_DATE"));//10
vpd.put("var11", varOList.get(i).getString("EXPIRE_DATE"));//11
vpd.put("var12", varOList.get(i).getString("VEHICLE_BRAND"));//12
vpd.put("var13", varOList.get(i).getString("VEHICLE_MODEL"));//13
vpd.put("var14", varOList.get(i).getString("VOUCH_TOTALMASS"));//14
vpd.put("var15", varOList.get(i).getString("VOUCH_PAYLOAD"));//15
//vpd.put("var16", varOList.get(i).getString("VOLUME"));//16
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv,dataMap);
return mv;
}
}

11
src/main/java/com/zcloud/controller/system/UsersController.java
View File

@ -228,24 +228,25 @@ public class UsersController extends BaseController {
/**
* 根据从业类型查询用户
*
* @param
* @param page
* @return
* @throws Exception
*/
@RequestMapping("/listSelectPersonType")
@ResponseBody
@LogAnno(menuType = "综合管理", menuServer = "特种设备", instructionsOperate = "设备管理", instructionsType = "用户列表")
public Object listSelectPersonType() throws Exception {
public Object listSelectPersonType(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
//page.setPd(pd);
List<PageData> userList = usersService.userSelectPersonTypelist(pd);//列出用户列表
page.setPd(pd);
List<PageData> userList = usersService.userSelectPersonTypelistPage(page);//列出用户列表
map.put("userList", userList);
//map.put("page", page);
map.put("page", page);
map.put("pd", pd);
map.put("result", errInfo);
return map;
}

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

@ -61,7 +61,5 @@ public interface InspectAnnuallyMapper {
List<PageData> annuallyList(Page page);
List<PageData> listOut(PageData pd);
}

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

@ -41,6 +41,4 @@ public interface OperatingVehiclesMapper {
PageData findByfindByPlateNumber(PageData pd);
void setScrapStatus(PageData pd);
List<PageData> listOut(PageData pd);
}

4
src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
View File

@ -272,7 +272,7 @@ public interface UsersMapper {
List<PageData> studentlist(PageData pd);
List<PageData> userSelectPersonTypelistPage(PageData pd);
List<PageData> userSelectPersonTypelistPage(Page page);
/**从业人员列表 //userlistPage(Page page)
* @param page
@ -294,7 +294,5 @@ public interface UsersMapper {
*/
void editPractitioner(PageData pd);
List<PageData> userSelectPersonTypelist(PageData pd);
PageData getUserByUserId(PageData pd);
}

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

@ -61,7 +61,5 @@ public interface InspectAnnuallyService {
List<PageData> annuallyList(Page page);
List<PageData> listOut(PageData pd);
}

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

@ -87,11 +87,6 @@ public class InspectAnnuallyServiceImpl implements InspectAnnuallyService {
return inspectAnnuallyMapper.annuallyList(page);
}
@Override
public List<PageData> listOut(PageData pd) {
return inspectAnnuallyMapper.listOut(pd);
}
}

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

@ -41,6 +41,4 @@ public interface OperatingVehiclesService {
PageData findByfindByPlateNumber(PageData pd);
void setScrapStatus(PageData pd);
List<PageData> listOut(PageData pd);
}

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

@ -61,9 +61,4 @@ public class OperatingVehiclesServiceImpl implements OperatingVehiclesService {
public void setScrapStatus(PageData pd) {
operatingVehiclesMapper.setScrapStatus(pd);
}
@Override
public List<PageData> listOut(PageData pd) {
return operatingVehiclesMapper.listOut(pd);
}
}

4
src/main/java/com/zcloud/service/system/UsersService.java
View File

@ -318,7 +318,7 @@ public interface UsersService {
void setState(PageData request) throws Exception;
List<PageData> userSelectPersonTypelistPage(PageData pageData);
List<PageData> userSelectPersonTypelistPage(Page page);
List<PageData> studentlist(PageData pd) throws Exception;
@ -367,7 +367,5 @@ public interface UsersService {
*/
void setPractitionerConfirm(PageData pd) throws Exception;
List<PageData> userSelectPersonTypelist(PageData pd);
PageData getUserByUserId(PageData pd);
}

9
src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
View File

@ -669,8 +669,8 @@ public class UsersServiceImpl implements UsersService {
}
@Override
public List<PageData> userSelectPersonTypelistPage(PageData pd) {
return usersMapper.userSelectPersonTypelistPage(pd);
public List<PageData> userSelectPersonTypelistPage(Page page) {
return usersMapper.userSelectPersonTypelistPage(page);
}
/**
@ -1329,11 +1329,6 @@ public class UsersServiceImpl implements UsersService {
usersMapper.setPractitionerReview(pd);
}
@Override
public List<PageData> userSelectPersonTypelist(PageData pd) {
return usersMapper.userSelectPersonTypelist(pd);
}
@Override
public PageData getUserByUserId(PageData pd) {
return usersMapper.getUserByUserId(pd);

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

@ -160,11 +160,10 @@
f.CREATOR,
f.CREATORNAME,
f.CREATTIME,
(SELECT sd.NAME FROM sys_dictionaries sd where sd.DICTIONARIES_ID=f.ANNUAL_INSPECTION_CYCLE) as ANNUAL_INSPECTION_CYCLE_NAME,
v.COMPANY_AREA as AREA
(SELECT sd.NAME FROM sys_dictionaries sd where sd.DICTIONARIES_ID=f.ANNUAL_INSPECTION_CYCLE) as ANNUAL_INSPECTION_CYCLE_NAME
from
<include refid="tableName"></include> f
left join v_traffic v on f.VEHICLE = v.ID
<include refid="tableName"></include>
f
where
f.INSPECTANNUALLY_ID = #{INSPECTANNUALLY_ID}
</select>
@ -223,6 +222,4 @@
AND
f.CORPINFO_ID = #{pd.CORPINFO_ID}
</select>
</mapper>

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

@ -553,17 +553,5 @@
where f.ISDELETE = '0' and f.CORPINFO_ID = #{corpId}
</select>
<select id="listOut" parameterType="pd" resultType="pd">
select
<include refid="Field2"></include>
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
and f.OPERATING_ID in
<foreach item="item" index="index" open="(" separator="," close=")" collection="ArrayDATA_IDS">
#{item}
</foreach>
</select>
</mapper>

29
src/main/resources/mybatis/datasource/system/UsersMapper.xml
View File

@ -1625,9 +1625,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by d.LEVEL asc ,d.DEP_ORDER,d.DEPARTMENT_ID asc, u.SORT asc,u.LAST_LOGIN desc
</select>
<select id="userSelectPersonTypelist" resultType="com.zcloud.entity.PageData">
select
u.USER_ID,
<!-- 用户类型用户列表 -->
<select id="userSelectPersonTypelistPage" parameterType="page" resultType="pd" >
select u.USER_ID,
u.USERNAME,
u.PASSWORD,
u.LAST_LOGIN,
@ -1648,29 +1648,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and d.DICTIONARIES_ID = '5ae743c76dbf496eb1b5101075b073d5'
</select>
<!-- 用户类型用户列表 -->
<select id="userSelectPersonTypelistPage" parameterType="pd" resultType="pd" >
select
u.USER_ID,
u.USERNAME,
u.PASSWORD,
u.LAST_LOGIN,
u.NAME,
u.SEX,
u.IP,
u.EMAIL,
u.NUMBER,
u.PHONE,
u.ISMAIN,
u.PUSH_CID,
r.PERSONNEL_TYPE
from <include refid="tableName"></include> u
left join sys_userinfo r on u.USER_ID = r.USER_ID
left join sys_dictionaries d on r.PERSONNEL_TYPE = d.DICTIONARIES_ID
where
u.ISDELETE = 0
and d.DICTIONARIES_ID = '5ae743c76dbf496eb1b5101075b073d5'
</select>
<!-- 从业人员列表 userlistPage -->
<select id="practitionerlistPage" parameterType="page" resultType="pd" >