Skip to content

Y
YX_IDENT_REFACTORING
Commit 311afa64 authored by Administrator's avatar Administrator
Browse files
Options

Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_REFACTORING into dev

parents c53e9e1a b817ff81
Hide whitespace changes
Inline Side-by-side
Showing with 588 additions and 132 deletions
src/main/java/com/yxproject/start/api/UserApi.java
View file @ 311afa64
...@@ -30,14 +30,10 @@ import java.util.*; ...@@ -30,14 +30,10 @@ import java.util.*;
public class UserApi { public class UserApi {
@Autowired @Autowired
private TaskService taskService; private TaskService taskService;
@Autowired @Autowired
private GroupNoService groupNoService; private GroupNoService groupNoService;
@Autowired @Autowired
private PoliceStationApplyReasonService policeStationApplyReasonService; private PoliceStationApplyReasonService policeStationApplyReasonService;
@Autowired @Autowired
private FailedCardService failedCardService; private FailedCardService failedCardService;
@Autowired @Autowired
...@@ -134,7 +130,6 @@ public class UserApi { ...@@ -134,7 +130,6 @@ public class UserApi {
Object groupInfoList = jsonObject.get("groupInfoList"); Object groupInfoList = jsonObject.get("groupInfoList");
List<GroupNoEntity> groupNoEntities = (List<GroupNoEntity>) groupInfoList; List<GroupNoEntity> groupNoEntities = (List<GroupNoEntity>) groupInfoList;
TaskEntity taskEntity = (TaskEntity) taskList; TaskEntity taskEntity = (TaskEntity) taskList;
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
int i = taskService.addProductionTaskListEntity(taskEntity, groupNoEntities); int i = taskService.addProductionTaskListEntity(taskEntity, groupNoEntities);
...@@ -353,44 +348,262 @@ public class UserApi { ...@@ -353,44 +348,262 @@ public class UserApi {
return null; return null;
} }
/** /**
* 通过任务单查询区县列表; * 通过任务单查询区县列表;
* *
* @return * @return
*/ */
@RequestMapping("getCountyList") @RequestMapping("getCountyListByTaskListId")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String getCountyListInfoByTaskListID(@RequestParam("taskListID") String tasklistid, HttpServletResponse resp) { public String getCountyListInfoByTaskListID(@RequestParam("taskListID") String tasklistid, HttpServletResponse resp) {
List<CountyListEntity> countyListInfoEntity = countyListService.findCountyListByTaskListID(tasklistid); List<CountyListEntity> countyListEntity = countyListService.findCountyListByTaskListID(tasklistid);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(countyListEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 通过状态查询区县列表;
*
* @returns
*/
@RequestMapping("getCountyListByTaskStateId")
// @RequiresPermissions("userInfo.add")//权限管理;
public String findCountyListByTaskStateId(@RequestParam("taskStateId") String TaskStateId, HttpServletResponse resp) {
List<CountyListEntity> countyListEntity = countyListService.findCountyListByTaskStateId(TaskStateId);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(countyListEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 通过制证类型查询区县列表;
*
* @returns
*/
@RequestMapping("getCountyListByCardType")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getCountyListByCardType(@RequestParam("cardType") String cardType, HttpServletResponse resp) {
List<CountyListEntity> countyListEntity = countyListService.findCountyListByCardType(cardType);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(countyListInfoEntity); yxjsonResponse.outPutSuccess(countyListEntity);
Map map = new HashMap(); Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity); // map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/**有误 /**
* 保存卡基表; * 通过任务单查询组列表;
* *
* @return * @return
*/ */
@RequestMapping("addCardBody") @RequestMapping("getGroupNoByTaskListId")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String addCardBodyInfo(@RequestParam("cardBodyId") String cardBodyId, HttpServletResponse resp) { public String getGroupNoByTaskListId(@RequestParam("taskListID") String tasklistid, HttpServletResponse resp) {
String map = "{\"cardBodyId\":\"1\",}"; List<GroupNoEntity> groupNoEntity = groupNoService.findGroupNoByTaskListID(tasklistid);
JSONObject jsonObject = JSONObject.fromObject(map);
Object cardBody = jsonObject.get("CardBody");
CardBodyEntity cardBodyEntity = (CardBodyEntity) cardBody;
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
int i = cardBodyService.addCardBodyEntity(cardBodyEntity); yxjsonResponse.outPutSuccess(groupNoEntity);
yxjsonResponse.outPutSuccess(i + "添加成功"); Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 通过状态查询组列表;
*
* @returns
*/
@RequestMapping("getGroupNoByTaskStateId")
// @RequiresPermissions("userInfo.add")//权限管理;
public String findGroupNoByTaskStateId(@RequestParam("taskStateId") String taskStateId, HttpServletResponse resp) {
List<GroupNoEntity> groupNoEntity = groupNoService.findGroupNoByTaskStateId(taskStateId);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(groupNoEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 通过制证类型查询组列表;
*
* @returns
*/
@RequestMapping("getGroupNoByCardType")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getGroupNoByCardType(@RequestParam("cardType") String cardType, HttpServletResponse resp) {
List<GroupNoEntity> groupNoEntity = groupNoService.findGroupNoByCardType(cardType);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(groupNoEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 查询TypeList通过状态;
*
* @return
*/
@RequestMapping("getTypeListByTaskStateId")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getTypeListByTaskStateId(@RequestParam("taskStateId") String taskStateId, HttpServletResponse resp) {
List <Map <String, Object>> taskEntity = taskService.findTypeListByTaskStateId(taskStateId);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(taskEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 查询CityList通过状态;
*
* @return
*/
@RequestMapping("getCityListByTaskStateId")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getCityListByTaskStateId(@RequestParam("taskStateId") String taskStateId, HttpServletResponse resp) {
List <Map <String, Object>> taskEntity = taskService.findCityListByTaskStateId(taskStateId);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(taskEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/**有误 /**
* 查询CityList通过制证类型;
*
* @return
*/
@RequestMapping("getCityListByCardType")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getCityListByCardType(@RequestParam("cardType") String cardType, HttpServletResponse resp) {
List <Map <String, Object>> taskEntity = taskService.findCityListByCardType(cardType);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(taskEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 查询派出所申领表通过保存时间;
*
* @return
*/
@RequestMapping("getPoliceStationApplyReasonBySaveDate")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getPoliceStationApplyReasonBySaveDate(@RequestParam("saveDate") String saveDate, HttpServletResponse resp) {
List <Map <String, Object>> policeStationApplyReasonEntity = policeStationApplyReasonService.findPoliceStationApplyReasonBySaveDate(saveDate);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(policeStationApplyReasonEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 查询派出所申领表通过制证类型;
*
* @return
*/
@RequestMapping("getPoliceStationApplyReasonByCardType")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getPoliceStationApplyReasonByCardType(@RequestParam("cardType") String cardType, HttpServletResponse resp) {
List <Map <String, Object>> policeStationApplyReasonEntity = policeStationApplyReasonService.findPoliceStationApplyReasonByCardType(cardType);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(policeStationApplyReasonEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 查询派出所申领表通过地市;
*
* @return
*/
@RequestMapping("getPoliceStationApplyReasonByCity")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getPoliceStationApplyReasonByCity(@RequestParam("city") String city, HttpServletResponse resp) {
List <Map <String, Object>> policeStationApplyReasonEntity = policeStationApplyReasonService.findPoliceStationApplyReasonByCity(city);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(policeStationApplyReasonEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 查询派出所申领表通过区县;
*
* @return
*/
@RequestMapping("getPoliceStationApplyReasonByCounty")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getPoliceStationApplyReasonByCounty(@RequestParam("county") String county, HttpServletResponse resp) {
List <Map <String, Object>> policeStationApplyReasonEntity = policeStationApplyReasonService.findPoliceStationApplyReasonByCounty(county);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(policeStationApplyReasonEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 查询派出所申领表通过派出所;
*
* @return
*/
@RequestMapping("getPoliceStationApplyReasonByGajgMC")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getPoliceStationApplyReasonByGajgMC(@RequestParam("gajgMC") String gajgMC, HttpServletResponse resp) {
List <Map <String, Object>> policeStationApplyReasonEntity = policeStationApplyReasonService.findPoliceStationApplyReasonByCardType(gajgMC);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(policeStationApplyReasonEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 查询卡基表;
*
* @return
*/
@RequestMapping("getCardBody")
// @RequiresPermissions("userInfo.add")//权限管理;
public String insertCardBody(@RequestParam("cardBodyId") String cardbodyid, HttpServletResponse resp) {
List<CardBodyEntity> cardBodyEntity = cardBodyService.insertCardBody(cardbodyid);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(cardBodyEntity);
Map map = new HashMap();
return yxjsonResponse.toJSONString();
}
/**
* 更新循环单 * 更新循环单
* 添加异常状态; * 添加异常状态;
* @return * @return
...@@ -410,36 +623,41 @@ public class UserApi { ...@@ -410,36 +623,41 @@ public class UserApi {
/** /**
* 更新入库时间 * 更新入库时间
*404 * 修改方法,在sql里面对合计值与出库数进行判断
* @return * @return
*/ */
@RequestMapping("updatePutinstorageDate") @RequestMapping("updateInStorageDate")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String updatePutinstorageDate(@RequestParam("id") String id, HttpServletResponse resp) { public String updateInStorageDate(@RequestParam("id") String id, HttpServletResponse resp) {
String map = "{\"id\":\"20181016001\",} "; String map = "{\"id\":\"20181016001\",} ";
JSONObject jsonObject = JSONObject.fromObject(map); JSONObject jsonObject = JSONObject.fromObject(map);
TaskEntity productionTaskListEntity = (TaskEntity) jsonObject.toBean(jsonObject, TaskEntity.class); Object inStorageCount = jsonObject.get("inStorageCount");
Object inStorageDate = jsonObject.get("inStorageDate");
TaskEntity taskEntity = (TaskEntity) inStorageDate;
CountyListEntity countyListEntity = (CountyListEntity) inStorageCount;
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
int i = taskService.updatePutinstorageDate(productionTaskListEntity); int i = taskService.updateInStorageDate(taskEntity,countyListEntity);
yxjsonResponse.outPutSuccess(i + "更新成功"); yxjsonResponse.outPutSuccess(i + "更新成功");
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/** /**
* 更新出库时间 * 更新出库时间
*
* @return * @return
*/ */
@RequestMapping("updateOutboundDate") @RequestMapping("updateOutBoundDate")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String updateOutboundDate(@RequestParam("id") String id, HttpServletResponse resp) { public String updateOutBoundDate(@RequestParam("id") String id, HttpServletResponse resp) {
String map = "{\"task_Id\":\"20181016001\",\"make_Type\":8,\"old_Make_Type\":8,} "; String map = "{\"id\":\"20181016001\",} ";
JSONObject jsonObject = JSONObject.fromObject(map); JSONObject jsonObject = JSONObject.fromObject(map);
TaskEntity taskEntity = (TaskEntity) jsonObject.toBean(jsonObject, TaskEntity.class); Object outStorageCount = jsonObject.get("outStorageCount");
Object putOutStorageDate = jsonObject.get("putOutStorageDate");
TaskEntity taskEntity = (TaskEntity) putOutStorageDate;
CountyListEntity countyListEntity = (CountyListEntity) outStorageCount;
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
int i = taskService.updateOutboundDate(taskEntity); int i = taskService.updateOutBoundDate(taskEntity,countyListEntity);
yxjsonResponse.outPutSuccess(i + "更新成功"); yxjsonResponse.outPutSuccess(i + "更新成功");
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
...@@ -447,7 +665,6 @@ public class UserApi { ...@@ -447,7 +665,6 @@ public class UserApi {
/** /**
* 对出库数进行更改 * 对出库数进行更改
* 更新出库数 * 更新出库数
* 有点问题
* @return * @return
*/ */
@RequestMapping("reviseOutBoundCount") @RequestMapping("reviseOutBoundCount")
...@@ -466,7 +683,6 @@ public class UserApi { ...@@ -466,7 +683,6 @@ public class UserApi {
/** /**
* 对入库数进行更改 * 对入库数进行更改
* 更新入库数 * 更新入库数
* 有点问题
* @return * @return
*/ */
@RequestMapping("reviseInBoundCount") @RequestMapping("reviseInBoundCount")
...@@ -490,7 +706,7 @@ public class UserApi { ...@@ -490,7 +706,7 @@ public class UserApi {
@RequestMapping("getConnectList") @RequestMapping("getConnectList")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String getConnectList(@RequestParam("save_Date") String save_Date, HttpServletResponse resp) { public String getConnectList(@RequestParam("save_Date") String save_Date, HttpServletResponse resp) {
List<CountyListEntity> countyListEntity = countyListService.getConnectList(save_Date); List <Map <String, Object>> countyListEntity = countyListService.getConnectList(save_Date);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(countyListEntity); yxjsonResponse.outPutSuccess(countyListEntity);
...@@ -499,6 +715,41 @@ public class UserApi { ...@@ -499,6 +715,41 @@ public class UserApi {
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
// /**
// * 下载交接单;
// *
// * @return
// */
// @RequestMapping("printConnectList")
//// @RequiresPermissions("userInfo.add")//权限管理;
// public byte[] printConnectList(@RequestParam("save_Date") String save_Date, HttpServletResponse response) {
//// cyclesheetID ="20180802032";
// response.setContentType("application/x-download");
// response.setCharacterEncoding("UTF-8");
// String dateTime = DateFormatUtils.format(new Date(), "yyyyMMddHH");
//// //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
// String fout = null;
// List <Map <String, Object>> countyListEntity = countyListService.getConnectList(save_Date);
// List<TaskEntity> taskEntities = taskService.findProductionTaskListEntityByID(Long.valueOf(save_Date));
// fout = exportExcel(countyListEntity, taskEntities.get(0).getCard_Type() + "", "p1", 6000, taskEntities.get(0).getCitycode(), dateTime, save_Date);
// String outFile = dateTime + taskEntities.get(0).getCitycode() + "二代身份证交接单";
// try {
// FileInputStream fis = new FileInputStream(new File(fout));
// byte[] b = new byte[fis.available()];
// fis.read(b);
// fis.close();
// response.addHeader("Content-Disposition", "attachment;filename=" + outFile + ".xls");
// return b;
// } catch (FileNotFoundException e) {
// e.printStackTrace();
// } catch (IOException e) {
// e.printStackTrace();
// }
// return null;
// }
/** /**
* 下载装箱单 * 下载装箱单
* *
...@@ -681,6 +932,7 @@ public class UserApi { ...@@ -681,6 +932,7 @@ public class UserApi {
} }
CellRangeAddress callRangeNum1 = new CellRangeAddress(19, 19, 1, 4);//起始行,结束行,起始列,结束列 CellRangeAddress callRangeNum1 = new CellRangeAddress(19, 19, 1, 4);//起始行,结束行,起始列,结束列
sheet.addMergedRegion(callRangeNum1); sheet.addMergedRegion(callRangeNum1);
row = sheet.createRow(20); row = sheet.createRow(20);
row.setHeightInPoints(Short.parseShort("32"));//设置行高 row.setHeightInPoints(Short.parseShort("32"));//设置行高
//创建单元格并且添加数据 //创建单元格并且添加数据
......
src/main/java/com/yxproject/start/entity/CityDicEntity.java deleted 100644 → 0
View file @ c53e9e1a
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Objects;
/**
* Created by zhangyusheng on 2018/11/16 10:51
*/
@Entity
@Table(name = "CITY_DIC", schema = "DAHAI", catalog = "")
public class CityDicEntity {
private String citycode;
private String cityname;
@Id
@Column(name = "CITYCODE", nullable = false, length = 6)
public String getCitycode() {
return citycode;
}
public void setCitycode(String citycode) {
this.citycode = citycode;
}
@Basic
@Column(name = "CITYNAME", nullable = false, length = 20)
public String getCityname() {
return cityname;
}
public void setCityname(String cityname) {
this.cityname = cityname;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
CityDicEntity that = (CityDicEntity) o;
return Objects.equals(citycode, that.citycode) &&
Objects.equals(cityname, that.cityname);
}
@Override
public int hashCode() {
return Objects.hash(citycode, cityname);
}
}
src/main/java/com/yxproject/start/entity/TaskEntity.java
View file @ 311afa64
...@@ -71,8 +71,6 @@ public class TaskEntity { ...@@ -71,8 +71,6 @@ public class TaskEntity {
this.citycode = citycode; this.citycode = citycode;
} }
@Basic @Basic
@Column(name = "SUBMIT_DATE", nullable = true) @Column(name = "SUBMIT_DATE", nullable = true)
public Date getSubmit_Date() { public Date getSubmit_Date() {
......
src/main/java/com/yxproject/start/mapper/CardBodyMapper.java
View file @ 311afa64
...@@ -3,13 +3,15 @@ package com.yxproject.start.mapper; ...@@ -3,13 +3,15 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.CardBodyEntity; import com.yxproject.start.entity.CardBodyEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/** /**
* Created by liuxinben on 2018/11/6.10:26 * Created by liuxinben on 2018/11/6.10:26
*/ */
@Mapper @Mapper
public interface CardBodyMapper { public interface CardBodyMapper {
public int insertCardBodyEntity(CardBodyEntity cardBodyEntity); public List <CardBodyEntity> insertCardBody(String cardBodyId);
public int updateCardBodyInfo(CardBodyEntity cardBodyEntity); public int updateCardBodyInfo(CardBodyEntity cardBodyEntity);
} }
\ No newline at end of file
src/main/java/com/yxproject/start/mapper/CountyListMapper.java
View file @ 311afa64
...@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by liuxinben on 2018/11/6.10:26 * Created by liuxinben on 2018/11/6.10:26
...@@ -14,7 +15,9 @@ import java.util.List; ...@@ -14,7 +15,9 @@ import java.util.List;
public interface CountyListMapper { public interface CountyListMapper {
public List<CountyListEntity> findCountyListByTaskListID(String tasklistID); public List<CountyListEntity> findCountyListByTaskListID(String tasklistID);
public List<CountyListEntity> findCountyListByTaskStateId(String taskStateId);
public List<CountyListEntity> findCountyListByCardType(String cardType);
public int updateBoundCount(CountyListEntity countyListEntity); public int updateBoundCount(CountyListEntity countyListEntity);
public List<CountyListEntity>getConnectList(String save_Date); public List<Map<String,Object>> getConnectList(String save_Date);
} }
src/main/java/com/yxproject/start/mapper/GroupNoMapper.java
View file @ 311afa64
...@@ -11,19 +11,15 @@ import java.util.Map; ...@@ -11,19 +11,15 @@ import java.util.Map;
*/ */
@Mapper @Mapper
public interface GroupNoMapper { public interface GroupNoMapper {
public int insertGroupNoEntity(GroupNoEntity groupNoEntity); public int insertGroupNoEntity(GroupNoEntity groupNoEntity);
public List<GroupNoEntity> findGroupNoEntityByAcceptNo(String acceptNo); public List<GroupNoEntity> findGroupNoEntityByAcceptNo(String acceptNo);
public int updateGroupinfoEntity(GroupNoEntity groupNoEntity); public int updateGroupinfoEntity(GroupNoEntity groupNoEntity);
public List<GroupNoEntity> findGroupNoEntityListByTaskId(long task_Id); public List<GroupNoEntity> findGroupNoEntityListByTaskId(long task_Id);
public int findGroupNoCountByTaskId(String task_Id); public int findGroupNoCountByTaskId(String task_Id);
public List<Map<String,Object>> findSpecialCountyList(String task_Id); public List<Map<String,Object>> findSpecialCountyList(String task_Id);
public List<Map<String,Object>> findNormalCountyList(String task_Id); public List<Map<String,Object>> findNormalCountyList(String task_Id);
public List<GroupNoEntity> findGroupNoByTaskListID(String tasklistID);
public List<GroupNoEntity> findGroupNoByTaskStateId(String taskStateId);
public List<GroupNoEntity> findGroupNoByCardType(String cardType);
} }
src/main/java/com/yxproject/start/mapper/PoliceStationApplyReasonMapper.java
View file @ 311afa64
...@@ -15,4 +15,9 @@ public interface PoliceStationApplyReasonMapper { ...@@ -15,4 +15,9 @@ public interface PoliceStationApplyReasonMapper {
public int updatePoliceStationApplyReasonEntity(PoliceStationApplyReasonEntity policeStationApplyReasonEntity); public int updatePoliceStationApplyReasonEntity(PoliceStationApplyReasonEntity policeStationApplyReasonEntity);
public List<Map<String,Object>> findNormalApplyReasonByCyclesheetID(String cyclesheetid); public List<Map<String,Object>> findNormalApplyReasonByCyclesheetID(String cyclesheetid);
public List<Map<String,Object>> findSpecialApplyReasonByCyclesheetID(String cyclesheetid); public List<Map<String,Object>> findSpecialApplyReasonByCyclesheetID(String cyclesheetid);
public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(String saveDate);
public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType);
public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String city);
public List<Map<String,Object>> findPoliceStationApplyReasonByCounty(String county);
public List<Map<String,Object>> findPoliceStationApplyReasonByGajgMC(String gajgMC);
} }
src/main/java/com/yxproject/start/mapper/TaskMapper.java
View file @ 311afa64
...@@ -4,19 +4,21 @@ import com.yxproject.start.entity.TaskEntity; ...@@ -4,19 +4,21 @@ import com.yxproject.start.entity.TaskEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by zhangyusheng on 2018/10/13 9:36 * Created by zhangyusheng on 2018/10/13 9:36
*/ */
@Mapper @Mapper
public interface TaskMapper { public interface TaskMapper {
public List<TaskEntity> findTaskEntity(long id); public List<TaskEntity> findTaskEntity(long id);
public int insertTaskEntity(TaskEntity taskEntity); public int insertTaskEntity(TaskEntity taskEntity);
public int updateTaskEntity(TaskEntity taskEntity); public int updateTaskEntity(TaskEntity taskEntity);
public List<TaskEntity> findTaskEntityByAcceptNo(String acceptNo); public List<TaskEntity> findTaskEntityByAcceptNo(String acceptNo);
public List<TaskEntity> findTaskEntityByState(int state); public List<TaskEntity> findTaskEntityByState(int state);
public int replaceExceptionInformation(TaskEntity taskEntity); public int replaceExceptionInformation(TaskEntity taskEntity);
public int totalnum (int i); public int totalNum (int i);
public List<Map<String,Object>> findTypeListByTaskStateId(String taskStateId);
public List<Map<String,Object>> findCityListByTaskStateId(String taskStateId);
public List<Map<String,Object>> findCityListByCardType(String cardType);
} }
src/main/java/com/yxproject/start/service/CardBodyService.java
View file @ 311afa64
...@@ -9,7 +9,7 @@ import java.util.List; ...@@ -9,7 +9,7 @@ import java.util.List;
* Created by Administrator on 2018/11/7. * Created by Administrator on 2018/11/7.
*/ */
public interface CardBodyService { public interface CardBodyService {
public int addCardBodyEntity(CardBodyEntity cardBodyEntity); public List<CardBodyEntity> insertCardBody(String cardBodyId);
public int updateCardBody(CardBodyEntity map); public int updateCardBody(CardBodyEntity map);
......
src/main/java/com/yxproject/start/service/CountyListService.java
View file @ 311afa64
...@@ -4,11 +4,14 @@ import com.yxproject.start.entity.CountyListEntity; ...@@ -4,11 +4,14 @@ import com.yxproject.start.entity.CountyListEntity;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
public interface CountyListService { public interface CountyListService {
public List<CountyListEntity> findCountyListByTaskListID(String tasklistID); public List<CountyListEntity> findCountyListByTaskListID(String tasklistID);
public int reviseOutBoundCount(CountyListEntity map); public List<CountyListEntity> findCountyListByTaskStateId(String taskStateId);
public int reviseInBoundCount(CountyListEntity map); public int reviseOutBoundCount(CountyListEntity countyListEntity);
public List<CountyListEntity> getConnectList(String save_Date); public int reviseInBoundCount(CountyListEntity countyListEntity);
public List<Map<String, Object>> getConnectList(String save_Date);
public List<CountyListEntity> findCountyListByCardType(String cardType);
} }
src/main/java/com/yxproject/start/service/GroupNoService.java
View file @ 311afa64
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.GroupNoEntity;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -8,4 +10,8 @@ import java.util.Map; ...@@ -8,4 +10,8 @@ import java.util.Map;
*/ */
public interface GroupNoService { public interface GroupNoService {
public List<Map<String, Object>> findCountyInfoList(String taskID); public List<Map<String, Object>> findCountyInfoList(String taskID);
public List<GroupNoEntity> findGroupNoByTaskListID(String tasklistID);
public List<GroupNoEntity> findGroupNoByTaskStateId(String taskStateId);
public List<GroupNoEntity> findGroupNoByCardType(String cardType);
} }
src/main/java/com/yxproject/start/service/PoliceStationApplyReasonService.java
View file @ 311afa64
package com.yxproject.start.service; package com.yxproject.start.service;
import java.util.List;
import java.util.Map;
/** /**
* Created by zhangyusheng on 2018/11/12 14:27 * Created by zhangyusheng on 2018/11/12 14:27
*/ */
public interface PoliceStationApplyReasonService { public interface PoliceStationApplyReasonService {
public int savePoliceStationApplyReasonEntity(String cyclesheetID); public int savePoliceStationApplyReasonEntity(String cyclesheetID);
public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(String saveDate);
public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType);
public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String city);
public List<Map<String,Object>> findPoliceStationApplyReasonByCounty(String county);
public List<Map<String,Object>> findPoliceStationApplyReasonByGajgMC(String gajgMC);
} }
src/main/java/com/yxproject/start/service/TaskService.java
View file @ 311afa64
...@@ -22,15 +22,21 @@ public interface TaskService { ...@@ -22,15 +22,21 @@ public interface TaskService {
public int savePoliceStationVailedEntity(List<PoliceStationVailedEntity> policeStationVailedInfoEntities); public int savePoliceStationVailedEntity(List<PoliceStationVailedEntity> policeStationVailedInfoEntities);
public List<PoliceStationVailedEntity> find(String id); public List<PoliceStationVailedEntity> find( String id);
public List<Map<String,Object>> findProductionTaskListEntityByState(int state); public List<Map<String,Object>> findProductionTaskListEntityByState(int state);
public int addExceptionState(TaskEntity state); public int addExceptionState(TaskEntity state);
public int updateOutboundDate(TaskEntity map); public int updateOutBoundDate(TaskEntity taskEntity, CountyListEntity countyListEntity);
public int updatePutinstorageDate(TaskEntity map); public int updateInStorageDate(TaskEntity taskEntity, CountyListEntity countyListEntity );
public List<Map<String,Object>> findTypeListByTaskStateId(String taskStateId);
public List<Map<String,Object>> findCityListByTaskStateId(String taskStateId);
public List<Map<String,Object>> findCityListByCardType(String cardType);
} }
src/main/java/com/yxproject/start/service/impl/CardBodyServiceImpl.java
View file @ 311afa64
...@@ -32,7 +32,8 @@ public class CardBodyServiceImpl implements CardBodyService { ...@@ -32,7 +32,8 @@ public class CardBodyServiceImpl implements CardBodyService {
@Override @Override
public int addCardBodyEntity(CardBodyEntity cardBodyEntity) { public List<CardBodyEntity> insertCardBody(String cardBodyId) {
return cardBodyMapper.insertCardBodyEntity(cardBodyEntity); List<CardBodyEntity> cardBody = cardBodyMapper.insertCardBody(cardBodyId);
return cardBody;
} }
} }
src/main/java/com/yxproject/start/service/impl/CountyListServiceImpl.java
View file @ 311afa64
...@@ -6,8 +6,10 @@ import com.yxproject.start.service.CountyListService; ...@@ -6,8 +6,10 @@ import com.yxproject.start.service.CountyListService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by liuxinben on 2018/11/6.13:42 * Created by liuxinben on 2018/11/6.13:42
...@@ -24,6 +26,18 @@ public class CountyListServiceImpl implements CountyListService { ...@@ -24,6 +26,18 @@ public class CountyListServiceImpl implements CountyListService {
return byTaskListID; return byTaskListID;
} }
@Override
public List <CountyListEntity> findCountyListByTaskStateId(String taskStateId) {
List<CountyListEntity> TaskStateId = countyListMapper.findCountyListByTaskStateId(taskStateId);
return TaskStateId;
}
@Override
public List <CountyListEntity> findCountyListByCardType( String cardType ) {
List<CountyListEntity> CardType = countyListMapper.findCountyListByCardType(cardType);
return CardType;
}
@Override @Override
public int reviseOutBoundCount(CountyListEntity countyListEntity) { public int reviseOutBoundCount(CountyListEntity countyListEntity) {
countyListEntity.setOut_Storage_Count(countyListEntity.getOut_Storage_Count()); countyListEntity.setOut_Storage_Count(countyListEntity.getOut_Storage_Count());
...@@ -37,8 +51,9 @@ public class CountyListServiceImpl implements CountyListService { ...@@ -37,8 +51,9 @@ public class CountyListServiceImpl implements CountyListService {
} }
@Override @Override
public List<CountyListEntity> getConnectList(String save_Date) { public List<Map<String, Object>> getConnectList(String save_Date) {
return countyListMapper.getConnectList(save_Date); return countyListMapper.getConnectList(save_Date);
} }
} }
\ No newline at end of file
src/main/java/com/yxproject/start/service/impl/GroupNoServiceImpl.java
View file @ 311afa64
package com.yxproject.start.service.impl; package com.yxproject.start.service.impl;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.mapper.GroupNoMapper; import com.yxproject.start.mapper.GroupNoMapper;
import com.yxproject.start.service.GroupNoService; import com.yxproject.start.service.GroupNoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -29,4 +30,22 @@ public class GroupNoServiceImpl implements GroupNoService { ...@@ -29,4 +30,22 @@ public class GroupNoServiceImpl implements GroupNoService {
return list; return list;
} }
@Override
public List<GroupNoEntity> findGroupNoByTaskListID( String tasklistid) {
List<GroupNoEntity> byTaskListID = groupNoMapper.findGroupNoByTaskListID(tasklistid);
return byTaskListID;
}
@Override
public List <GroupNoEntity> findGroupNoByTaskStateId(String taskStateId) {
List<GroupNoEntity> TaskStateId = groupNoMapper.findGroupNoByTaskStateId(taskStateId);
return TaskStateId;
}
@Override
public List <GroupNoEntity> findGroupNoByCardType( String cardType ) {
List<GroupNoEntity> CardType = groupNoMapper.findGroupNoByCardType(cardType);
return CardType;
}
} }
src/main/java/com/yxproject/start/service/impl/PoliceStationApplyReasonServiceImpl.java
View file @ 311afa64
...@@ -48,4 +48,58 @@ public class PoliceStationApplyReasonServiceImpl implements PoliceStationApplyRe ...@@ -48,4 +48,58 @@ public class PoliceStationApplyReasonServiceImpl implements PoliceStationApplyRe
} }
return 1; return 1;
} }
/**
* 查询派出所申领表通过保存时间;
* @param
* @return
*/
@Override
public List <Map <String, Object>> findPoliceStationApplyReasonBySaveDate( String saveDate ) {
List <Map <String, Object>> SaveData =policeStationApplyReasonMapper.findPoliceStationApplyReasonBySaveDate(saveDate);
return SaveData;
}
/**
* 查询派出所申领表通过制证类型;
* @param
* @return
*/
@Override
public List <Map <String, Object>> findPoliceStationApplyReasonByCardType(String cardType) {
List <Map <String, Object>> CardType =policeStationApplyReasonMapper.findPoliceStationApplyReasonByCardType(cardType);
return CardType;
}
/**
* 查询派出所申领表通过地市;
* @param
* @return
*/
@Override
public List <Map <String, Object>> findPoliceStationApplyReasonByCity(String city) {
List <Map <String, Object>> City =policeStationApplyReasonMapper.findPoliceStationApplyReasonByCity(city);
return City;
}
/**
* 查询派出所申领表通过区县;
* @param
* @return
*/
@Override
public List <Map <String, Object>> findPoliceStationApplyReasonByCounty(String county) {
List <Map <String, Object>> County =policeStationApplyReasonMapper.findPoliceStationApplyReasonByCounty(county);
return County;
}
/**
* 查询派出所申领表通过派出所;
* @param
* @return
*/
@Override
public List <Map <String, Object>> findPoliceStationApplyReasonByGajgMC(String gajgMC) {
List <Map <String, Object>> GajgMC =policeStationApplyReasonMapper.findPoliceStationApplyReasonByGajgMC(gajgMC);
return GajgMC;
}
} }
src/main/java/com/yxproject/start/service/impl/TaskServiceImpl.java
View file @ 311afa64
...@@ -5,8 +5,6 @@ import com.yxproject.start.entity.accu.AccCardTEntity; ...@@ -5,8 +5,6 @@ import com.yxproject.start.entity.accu.AccCardTEntity;
import com.yxproject.start.entity.prod.ProdCardTEntity; import com.yxproject.start.entity.prod.ProdCardTEntity;
import com.yxproject.start.mapper.*; import com.yxproject.start.mapper.*;
import com.yxproject.start.entity.CountyListEntity; import com.yxproject.start.entity.CountyListEntity;
import net.sf.json.JSONObject;
import java.util.Scanner;
import com.yxproject.start.service.TaskService; import com.yxproject.start.service.TaskService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -435,16 +433,18 @@ public class TaskServiceImpl implements TaskService { ...@@ -435,16 +433,18 @@ public class TaskServiceImpl implements TaskService {
return i; return i;
} }
private CountyListEntity countyListEntity;
/** /**
* 更新出库时间 * 更新出库时间
* @param * @param
* @param countyListEntity
* @return * @return
*/ */
@Override @Override
public int updateOutboundDate(TaskEntity taskEntity) { public int updateOutBoundDate(TaskEntity taskEntity, CountyListEntity countyListEntity) {
int i=0; int i=0;
i= taskMapper.totalnum(i); i= taskMapper.totalNum(i);
if (countyListEntity.getOut_Storage_Count()==i){ if (countyListEntity.getOut_Storage_Count()==i){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
taskEntity.setOut_Storage_Date(new Date()); taskEntity.setOut_Storage_Date(new Date());
...@@ -461,9 +461,9 @@ public class TaskServiceImpl implements TaskService { ...@@ -461,9 +461,9 @@ public class TaskServiceImpl implements TaskService {
* @return * @return
*/ */
@Override @Override
public int updatePutinstorageDate(TaskEntity taskEntity) { public int updateInStorageDate(TaskEntity taskEntity, CountyListEntity countyListEntity ) {
int i=0; int i=0;
i= taskMapper.totalnum(i); i= taskMapper.totalNum(i);
if (countyListEntity.getIn_Storage_Count()==i){ if (countyListEntity.getIn_Storage_Count()==i){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
taskEntity.setIn_Storage_Date(new Date()); taskEntity.setIn_Storage_Date(new Date());
...@@ -474,6 +474,39 @@ public class TaskServiceImpl implements TaskService { ...@@ -474,6 +474,39 @@ public class TaskServiceImpl implements TaskService {
} }
} }
/**
* 通过状态查找TypeList
* @param
* @return
*/
@Override
public List <Map <String, Object>> findTypeListByTaskStateId( String taskStateId ) {
List <Map <String, Object>> TaskStateId =taskMapper.findTypeListByTaskStateId(taskStateId);
return TaskStateId;
}
/**
* 通过状态查找CityList
* @param
* @return
*/
@Override
public List <Map <String, Object>> findCityListByTaskStateId( String taskStateId ) {
List <Map <String, Object>> TaskStateId =taskMapper.findCityListByTaskStateId(taskStateId);
return TaskStateId;
}
/**
* 通过制证类型查找CityList
* @param
* @return
*/
@Override
public List <Map <String, Object>> findCityListByCardType( String cardType ) {
List <Map <String, Object>> CardType =taskMapper.findCityListByCardType(cardType);
return CardType;
}
/** /**
* 测试查询 * 测试查询
* *
......
src/main/resources/mapper/CardBodyMapper.xml
View file @ 311afa64
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yxproject.start.mapper.CardBodyInfoMapper"> <mapper namespace="com.yxproject.start.mapper.CardBodyMapper">
<resultMap id="CardBodyInfoMapper" type="com.yxproject.start.entity.CardBodyEntity"> <resultMap id="CardBodyInfoMapper" type="com.yxproject.start.entity.CardBodyEntity">
<id column="CARD_BODY_ID" property="card_Body_Id" jdbcType="NUMERIC"/> <id column="CARD_BODY_ID" property="card_Body_Id" jdbcType="NUMERIC"/>
<result column="SAVE_DATE" property="save_Date" jdbcType="DATE"/> <result column="SAVE_DATE" property="save_Date" jdbcType="DATE"/>
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
<result column="TOTAL_COUNT" property="total_Count" jdbcType="NUMERIC"/> <result column="TOTAL_COUNT" property="total_Count" jdbcType="NUMERIC"/>
</resultMap> </resultMap>
<select id="insertCardBodyEntity" resultType="com.yxproject.start.entity.CardBodyEntity" parameterType="String"> <select id="insertCardBody" resultType="com.yxproject.start.entity.CardBodyEntity" parameterType="String">
select * from CARD_BODY where CARD_BODY_ID=#{card_Body_Id} SELECT * FROM CARD_BODY where card_Body_Id=#{card_Body_Id}
</select> </select>
<update id="updateCardBody" parameterType="com.yxproject.start.entity.CardBodyEntity"> <update id="updateCardBody" parameterType="com.yxproject.start.entity.CardBodyEntity">
......
src/main/resources/mapper/CountyListMapper.xml
View file @ 311afa64
...@@ -15,15 +15,23 @@ ...@@ -15,15 +15,23 @@
<!--Insert into DAHAI.SYS_PERMISSION (ID,AVAILABLE,NAME,PARENT_ID,PARENT_IDS,PERMISSION,RESOURCE_TYPE,URL) values (PERMISSION_seq.nextval,0,#{name},#{parentId},#{parentIds},#{permission},#{resourceType},#{url})--> <!--Insert into DAHAI.SYS_PERMISSION (ID,AVAILABLE,NAME,PARENT_ID,PARENT_IDS,PERMISSION,RESOURCE_TYPE,URL) values (PERMISSION_seq.nextval,0,#{name},#{parentId},#{parentIds},#{permission},#{resourceType},#{url})-->
<!--</insert>--> <!--</insert>-->
<select id="findCountyListByTaskListID" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String"> <select id="findCountyListByTaskListID" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String">
SELECT * FROM COUNTY_LIST where task_Id=#{task_Id} SELECT * FROM COUNTY_LIST where TASK_ID=#{task_Id}
</select>
<select id="findCountyListByTaskStateId" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String">
SELECT * FROM COUNTY_LIST left join TASK on COUNTY_LIST.TASK_ID = TASK.TASK_ID where TASK_STATE_ID=#{task_State_Id}
</select>
<select id="findCountyListByCardType" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String">
SELECT * FROM COUNTY_LIST left join TASK on COUNTY_LIST.TASK_ID = TASK.TASK_ID left join CARD_TYPE_DIC on TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID where CARD_TYPE_DIC.CARD_TYPE=#{card_Type}
</select> </select>
<update id="updateBoundCount" parameterType="com.yxproject.start.entity.CountyListEntity" > <update id="updateBoundCount" parameterType="com.yxproject.start.entity.CountyListEntity" >
update COUNTY_LIST OUT_STORAGE_COUNT =#{out_Storage_Count},IN_STORAGE_COUNT =#{in_Storage_Count} where COUNTY_LIST_ID =#{county_List_Id} update COUNTY_LIST SET OUT_STORAGE_COUNT =#{out_Storage_Count},IN_STORAGE_COUNT =#{in_Storage_Count} where COUNTY_LIST_ID =#{county_List_Id}
</update> </update>
<select id="getConnectList" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String"> <select id="getConnectList" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String">
SELECT OUT_STORAGE_COUNT FROM COUNTY_LIST where save_Date=#{save_Date} SELECT OUT_STORAGE_COUNT FROM COUNTY_LIST
</select> </select>
</mapper> </mapper>
src/main/resources/mapper/GroupNoMapper.xml
View file @ 311afa64
...@@ -43,4 +43,16 @@ ...@@ -43,4 +43,16 @@
SELECT * FROM TABLE(find_normal_county_list.GET_county_infos(#{task_Id})) SELECT * FROM TABLE(find_normal_county_list.GET_county_infos(#{task_Id}))
</select> </select>
<select id="findGroupNoByTaskListID" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
SELECT * FROM GROUP_NO left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID where TASK_ID=#{task_Id}
</select>
<select id="findGroupNoByTaskStateId" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
SELECT * FROM GROUP_NO left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID where TASK_STATE_ID=#{task_State_Id}
</select>
<select id="findGroupNoByCardType" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
SELECT * FROM GROUP_NO left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID where CARD_TYPE=#{card_type}
</select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/PoliceStationApplyReasonMapper.xml
View file @ 311afa64
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<mapper namespace="com.yxproject.start.mapper.PoliceStationApplyReasonMapper"> <mapper namespace="com.yxproject.start.mapper.PoliceStationApplyReasonMapper">
<resultMap id="PoliceStationApplyReasonMapper" type="com.yxproject.start.entity.PoliceStationApplyReasonEntity"> <resultMap id="PoliceStationApplyReasonMapper" type="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
<id column="POLICE_STATION_APPLY_REASON_ID" property="police_Station_Apply_Reason_Id" jdbcType="VARCHAR"/> <id column="POLICE_STATION_APPLY_REASON_ID" property="police_Station_Apply_Reason_Id" jdbcType="VARCHAR"/>
<result column="APPLY_REASON_SAVEDATE" property="apply_Reason_Savedate" jdbcType="VARCHAR"/> <result column="SAVE_DATE" property="save_Date" jdbcType="VARCHAR"/>
<result column="CYCLESHEETID" property="cyclesheetid" jdbcType="VARCHAR"/> <result column="CYCLESHEETID" property="cyclesheetid" jdbcType="VARCHAR"/>
<result column="POLICE_STATION_CODE" property="police_Station_Code" jdbcType="VARCHAR"/> <result column="POLICE_STATION_CODE" property="police_Station_Code" jdbcType="VARCHAR"/>
<result column="APPLY_REASON_CODE" property="apply_Reason_Code" jdbcType="NUMERIC"/> <result column="APPLY_REASON_CODE" property="apply_Reason_Code" jdbcType="NUMERIC"/>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<update id="updatePoliceStationApplyReasonEntity" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity"> <update id="updatePoliceStationApplyReasonEntity" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
update POLICE_STATION_APPLY_REASON set POLICE_STATION_APPLY_REASON_ID=#{police_Station_Apply_Reason_Id} update POLICE_STATION_APPLY_REASON set POLICE_STATION_APPLY_REASON_ID=#{police_Station_Apply_Reason_Id}
<if test="apply_Reason_Savedate">,APPLY_REASON_SAVEDATE =#{apply_Reason_Savedate}</if> <if test="save_Date">,save_Data =#{save_Date}</if>
<if test="cyclesheetid">,cyclesheetid =#{cyclesheetid}</if> <if test="cyclesheetid">,cyclesheetid =#{cyclesheetid}</if>
<if test="police_Station_Code">,police_Station_Code =#{police_Station_Code}</if> <if test="police_Station_Code">,police_Station_Code =#{police_Station_Code}</if>
<if test="apply_Reason_Code">,apply_Reason_Code =#{apply_Reason_Code}</if> <if test="apply_Reason_Code">,apply_Reason_Code =#{apply_Reason_Code}</if>
...@@ -33,5 +33,24 @@ ...@@ -33,5 +33,24 @@
SELECT * FROM TABLE(find_special_apply_reason_list.get_apply_reason_list(#{cyclesheetid})) SELECT * FROM TABLE(find_special_apply_reason_list.get_apply_reason_list(#{cyclesheetid}))
</select> </select>
<select id="findPoliceStationApplyReasonBySaveDate" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
SELECT * FROM POLICE_STATION_APPLY_REASON where SAVE_DATE=#{save_Data}
</select>
<select id="findPoliceStationApplyReasonByCardType" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
SELECT * FROM POLICE_STATION_APPLY_REASON left join TASK on POLICE_STATION_APPLY_REASON.TASK_ID = TASK.TASK_ID where CARD_TYPE=#{card_Type}
</select>
<select id="findPoliceStationApplyReasonByCity" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
SELECT * FROM POLICE_STATION_APPLY_REASON left join TASK on POLICE_STATION_APPLY_REASON.TASK_ID = TASK.TASK_ID left join CITY_DIC on TASK.CITYCODE = CITY_DIC.CITYCODE where CITYNAME=#{cityname}
</select>
<select id="findPoliceStationApplyReasonByCounty" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
SELECT * FROM POLICE_STATION_APPLY_REASON left join COUNTY_LIST on POLICE_STATION_APPLY_REASON.TASK_ID=COUNTY_LIST.TASK_ID left join COUNTY_DIC on COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE where COUNTYNAME=#{countyname}
</select>
<select id="findPoliceStationApplyReasonByGajgMC" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
SELECT * FROM POLICE_STATION_APPLY_REASON left join GAJG_DM on POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE = GAJG_DM.GAJG_DM where GAJG_MC=#{gajg_MC}
</select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/TaskMapper.xml
View file @ 311afa64
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yxproject.start.mapper.TaskMapper"> <mapper namespace="com.yxproject.start.mapper.TaskMapper">
<resultMap id="TaskMap" type="com.yxproject.start.entity.TaskEntity"> <resultMap id="TaskMappper" type="com.yxproject.start.entity.TaskEntity">
<id column="TASK_ID" property="task_Id" jdbcType="NUMERIC"/> <id column="TASK_ID" property="task_Id" jdbcType="NUMERIC"/>
<result column="CARD_TYPE" property="card_Type" jdbcType="NUMERIC"/> <result column="CARD_TYPE" property="card_Type" jdbcType="NUMERIC"/>
<result column="OLD_CARD_TYPE" property="old_Card_Type" jdbcType="NUMERIC"/> <result column="OLD_CARD_TYPE" property="old_Card_Type" jdbcType="NUMERIC"/>
...@@ -37,17 +37,17 @@ ...@@ -37,17 +37,17 @@
<update id="updateTaskEntity" parameterType="com.yxproject.start.entity.TaskEntity"> <update id="updateTaskEntity" parameterType="com.yxproject.start.entity.TaskEntity">
update TASK update TASK
<set> <set>
<if test="card_Type ">card_Type =#{card_Type},</if> <if test="card_Type">card_Type =#{card_Type},</if>
<if test="old_Card_Type ">old_Card_Type =#{old_Card_Type},</if> <if test="old_Card_Type">old_Card_Type =#{old_Card_Type},</if>
<if test="citycode ">CITYCODE =#{citycode},</if> <if test="citycode">CITYCODE =#{citycode},</if>
<if test="submit_Date">submit_Date =#{submit_Date},</if> <if test="submit_Date">submit_Date =#{submit_Date},</if>
<if test="issued_Date ">issued_Date =#{issued_Date},</if> <if test="issued_Date">issued_Date =#{issued_Date},</if>
<if test="print_State ">print_State =#{print_State},</if> <if test="print_State">print_State =#{print_State},</if>
<if test="download_Date">download_Date =#{download_Date},</if> <if test="download_Date">download_Date =#{download_Date},</if>
<if test="print_Out_Date">print_Out_Date =#{print_Out_Date},</if> <if test="print_Out_Date">print_Out_Date =#{print_Out_Date},</if>
<if test="position_Date">position_Date =#{position_Date},</if> <if test="position_Date">position_Date =#{position_Date},</if>
<if test="out_Workshop_Date">out_Workshop_Date =#{out_Workshop_Date},</if> <if test="out_Workshop_Date">out_Workshop_Date =#{out_Workshop_Date},</if>
<if test="quality_People_Name ">quality_People_Name =#{quality_People_Name},</if> <if test="quality_People_Name">quality_People_Name =#{quality_People_Name},</if>
<if test="quality_Test_Date">quality_Test_Date =#{quality_Test_Date},</if> <if test="quality_Test_Date">quality_Test_Date =#{quality_Test_Date},</if>
<if test="exception_Information">exception_Information =#{exception_Information},</if> <if test="exception_Information">exception_Information =#{exception_Information},</if>
<if test="out_Storage_Date">out_Storage_Date =#{out_Storage_Date},</if> <if test="out_Storage_Date">out_Storage_Date =#{out_Storage_Date},</if>
...@@ -65,15 +65,71 @@ ...@@ -65,15 +65,71 @@
</select> </select>
<select id="findProductionTaskListEntityByState" resultType="com.yxproject.start.entity.TaskEntity" parameterType="Integer"> <select id="findProductionTaskListEntityByState" resultType="com.yxproject.start.entity.TaskEntity" parameterType="Integer">
select * from TASK where TASK_STATE_ID =#{state } select * from TASK where TASK_STATE_ID =#{task_State_Id}
</select> </select>
<update id="replaceExceptionInformation" parameterType="com.yxproject.start.entity.TaskEntity" > <update id="replaceExceptionInformation" parameterType="com.yxproject.start.entity.TaskEntity" >
update TASK SET exception_Information = NULL,IS_EXCEPTION=#{is_Exception} where TASK_ID =#{task_Id} update TASK SET exception_Information = NULL,IS_EXCEPTION =#{is_Exception} where TASK_ID =#{task_Id}
</update> </update>
<select id="totalnum" resultType="Int"> <select id="totalNum" resultType="Integer">
select SUM(VAILD_COUNT)FROM GROUP_NO where TASK_ID =#{task_Id} select nvl(SUM(VAILD_COUNT),0) FROM GROUP_NO where TASK_ID =#{task_Id}
</select>
<select id="findTypeListByTaskStateId" resultType="java.util.HashMap">
WITH
t_Type_List
AS(
select CARD_TYPE_ID,CARD_TYPE_DIC.CARD_TYPE from TASK left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = TASK.CARD_TYPE where TASK_STATE_ID=#{task_State_Id}
),
t_Count_Card_Type
AS(
select CARD_TYPE_ID, count(CARD_TYPE_ID) qty from t_Type_List group by CARD_TYPE_ID
)
SELECT t1.CARD_TYPE_ID,t1.CARD_TYPE ,nvl(t2.qty,0) FROM t_Type_List t1 left join t_Count_Card_Type t2 on t1.CARD_TYPE_ID = t2.CARD_TYPE_ID
</select>
<select id="findCityListByCardType" resultType="java.util.HashMap">
WITH
t_City_List
AS(
select GROUP_NO.GROUP_NO,CITY_DIC.CITYNAME,GROUP_NO.VAILD_COUNT,GROUP_NO.INVALID_COUNT,TASK.CITYCODE from TASK left join GROUP_NO on GROUP_NO.TASK_ID = TASK.TASK_ID left join CITY_DIC on TASK.CITYCODE=CITY_DIC.CITYCODE where CARD_TYPE=#{card_Type}
),
t_Count_VAILD_COUNT
AS(
select VAILD_COUNT, count(VAILD_COUNT) qty1 from t_City_List group by VAILD_COUNT
),
t_Count_INVALID_COUNT
AS(
select INVALID_COUNT, count(INVALID_COUNT) qty2 from t_City_List group by INVALID_COUNT
),
t_Sum_VAILD_COUNT
AS(
select VAILD_COUNT, SUM(VAILD_COUNT) qty3 from t_City_List group by VAILD_COUNT
)
SELECT t1.GROUP_NO,t1.CITYNAME,t1.CITYCODE,t1.VAILD_COUNT,t1.INVALID_COUNT,nvl(t2.qty1,0),nvl(t3.qty2,0),nvl(t4.qty3,0) FROM t_City_List t1 left join t_Count_VAILD_COUNT t2 on t1.VAILD_COUNT = t2.VAILD_COUNT left join t_Count_INVALID_COUNT t3 on t1.INVALID_COUNT=t3.INVALID_COUNT left join t_Sum_VAILD_COUNT t4 on t1.VAILD_COUNT=t4.VAILD_COUNT
</select>
<select id="findCityListByTaskStateId" resultType="java.util.HashMap">
WITH
t_City_List
AS(
select GROUP_NO.GROUP_NO,CITY_DIC.CITYNAME,GROUP_NO.VAILD_COUNT,GROUP_NO.INVALID_COUNT,TASK.CITYCODE from TASK left join GROUP_NO on GROUP_NO.TASK_ID = TASK.TASK_ID left join CITY_DIC on TASK.CITYCODE=CITY_DIC.CITYCODE where TASK_STATE_ID=#{task_State_Id}
),
t_Count_VAILD_COUNT
AS(
select VAILD_COUNT, count(VAILD_COUNT) qty1 from t_City_List group by VAILD_COUNT
),
t_Count_INVALID_COUNT
AS(
select INVALID_COUNT, count(INVALID_COUNT) qty2 from t_City_List group by INVALID_COUNT
),
t_Sum_VAILD_COUNT
AS(
select VAILD_COUNT, SUM(VAILD_COUNT) qty3 from t_City_List group by VAILD_COUNT
)
SELECT t1.GROUP_NO,t1.CITYNAME,t1.CITYCODE,t1.VAILD_COUNT,t1.INVALID_COUNT,nvl(t2.qty1,0),nvl(t3.qty2,0),nvl(t4.qty3,0) FROM t_City_List t1 left join t_Count_VAILD_COUNT t2 on t1.VAILD_COUNT = t2.VAILD_COUNT left join t_Count_INVALID_COUNT t3 on t1.INVALID_COUNT=t3.INVALID_COUNT left join t_Sum_VAILD_COUNT t4 on t1.VAILD_COUNT=t4.VAILD_COUNT
</select> </select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment