Skip to content

Y
YX_IDENT_REFACTORING
Commit 0806c189 authored by Administrator's avatar Administrator
Browse files
Options

更新数据库规范 

 更新与数据库对应的实体
parent f08b7894
Show whitespace changes
Inline Side-by-side
Showing with 1299 additions and 875 deletions
src/main/java/com/yxproject/start/SqlProvider/SqlProvider.java
View file @ 0806c189
package com.yxproject.start.SqlProvider;
import com.yxproject.start.entity.FailedinfoEntity;
import org.apache.ibatis.jdbc.SQL;
/**
* Created by zhangyusheng on 2018/10/23 13:52
*/
......
src/main/java/com/yxproject/start/api/ShiroApi.java
View file @ 0806c189
......@@ -20,11 +20,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -36,7 +32,7 @@ import java.util.Map;
@Controller
public class ShiroApi {
@Autowired
private ProductionTaskListService productionTaskListService;
private TaskService taskService;
@Autowired
......@@ -49,7 +45,7 @@ public class ShiroApi {
private SysPermissionService sysPermissionService;
@Autowired
private FailedinfoService failedinfoService;
private FailedCardService failedCardService;
@RequestMapping(value = {"/", "/index"})
public String index(Map<String, Object> map) {
......@@ -214,7 +210,7 @@ public class ShiroApi {
@ResponseBody
public String getProductionTaskListByID(@RequestParam("id") String id, @Context HttpServletResponse resp) {
List<ProductionTaskListEntity> productionTaskListEntity = productionTaskListService.findProductionTaskListEntityByID(id);
List<TaskEntity> productionTaskListEntity = taskService.findProductionTaskListEntityByID(Long.valueOf(id));
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(productionTaskListEntity);
......@@ -234,10 +230,10 @@ public class ShiroApi {
public String updateProductionTask(@RequestParam("id") String id, @Context HttpServletResponse resp) {
String map = "{\"production_Task_List_Id\":\"20181016001\",\"make_Type\":8,\"old_Make_Type\":8,} ";
JSONObject jsonObject = JSONObject.fromObject(map);
ProductionTaskListEntity productionTaskListEntity = (ProductionTaskListEntity) jsonObject.toBean(jsonObject, ProductionTaskListEntity.class);
TaskEntity productionTaskListEntity = (TaskEntity) jsonObject.toBean(jsonObject, TaskEntity.class);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
int i = productionTaskListService.updateProductionTask(productionTaskListEntity);
int i = taskService.updateProductionTask(productionTaskListEntity);
yxjsonResponse.outPutSuccess(i + "更新成功");
return yxjsonResponse.toJSONString();
}
......@@ -253,14 +249,14 @@ public class ShiroApi {
public String addProductionTaskList(@RequestParam("id") String id, @Context HttpServletResponse resp) {
String map = "{\"productionTaskListId\":\"20181016001\",\"makeType\":4,\"oldMakeType\":7}";
JSONObject jsonObject = JSONObject.fromObject(map);
Object productionTaskList = jsonObject.get("productionTaskList");
Object taskList = jsonObject.get("taskList");
Object groupInfoList = jsonObject.get("groupInfoList");
List<GroupinfoEntity> groupinfoEntities = (List<GroupinfoEntity>) groupInfoList;
ProductionTaskListEntity productionTaskListEntity = (ProductionTaskListEntity) productionTaskList;
List<GroupNoEntity> groupNoEntities = (List<GroupNoEntity>) groupInfoList;
TaskEntity taskEntity = (TaskEntity) taskList;
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
int i = productionTaskListService.addProductionTaskListEntity(productionTaskListEntity, groupinfoEntities);
int i = taskService.addProductionTaskListEntity(taskEntity, groupNoEntities);
yxjsonResponse.outPutSuccess(i + "添加成功");
return yxjsonResponse.toJSONString();
}
......@@ -277,7 +273,7 @@ public class ShiroApi {
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
List<Object> cardInfoByCardIDOrAcceptNo = productionTaskListService.findCardInfoByCardIDOrAcceptNo(id);
List<Object> cardInfoByCardIDOrAcceptNo = taskService.findCardInfoByCardIDOrAcceptNo(id);
yxjsonResponse.outPutSuccess(cardInfoByCardIDOrAcceptNo);
return yxjsonResponse.toJSONString();
}
......@@ -294,7 +290,7 @@ public class ShiroApi {
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
int i = productionTaskListService.addQuickCyclesheetInfo(id);
int i = taskService.addQuickCyclesheetInfo(id);
yxjsonResponse.outPutSuccess(i + "添加成功");
return yxjsonResponse.toJSONString();
}
......@@ -326,14 +322,14 @@ public class ShiroApi {
public String savePoliceStationVailedInfoEntity(@RequestParam("id") String id, @Context HttpServletResponse resp) {
String map = "[{\"cyclesheetid\":\"20181016001\",\"invalid_Count\":1,\"police_Station_Code\":\"41108201\",\"police_Station_Vailed_Info_Id\":\"1\",\"sava_Date\":\"20181025\",\"vailed_Count\":1}]";
JSONArray jsonArray = JSONArray.fromObject(map);
List<PoliceStationVailedInfoEntity> policeStationVailedInfoEntities = new ArrayList<>();
List<PoliceStationVailedEntity> policeStationVailedInfoEntities = new ArrayList<>();
for (Object object : jsonArray) {
PoliceStationVailedInfoEntity o = (PoliceStationVailedInfoEntity) JSONObject.toBean((JSONObject) object, PoliceStationVailedInfoEntity.class);
PoliceStationVailedEntity o = (PoliceStationVailedEntity) JSONObject.toBean((JSONObject) object, PoliceStationVailedEntity.class);
policeStationVailedInfoEntities.add(o);
}
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
int i = productionTaskListService.savePoliceStationVailedInfoEntity(policeStationVailedInfoEntities);
int i = taskService.savePoliceStationVailedEntity(policeStationVailedInfoEntities);
yxjsonResponse.outPutSuccess(i + "添加成功");
return yxjsonResponse.toJSONString();
}
......@@ -350,8 +346,8 @@ public class ShiroApi {
public String test(@RequestParam("id") String permissionId, @Context HttpServletResponse resp) {
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
List<PoliceStationVailedInfoEntity> policeStationVailedInfoEntities = productionTaskListService.find(permissionId);
yxjsonResponse.outPutSuccess(policeStationVailedInfoEntities);
List<PoliceStationVailedEntity> policeStationVailedEntities = taskService.find(permissionId);
yxjsonResponse.outPutSuccess(policeStationVailedEntities);
System.out.println(yxjsonResponse);
return yxjsonResponse.toJSONString();
}
......
src/main/java/com/yxproject/start/api/UserInfoApi.java
View file @ 0806c189
......@@ -16,7 +16,6 @@ import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest;
......@@ -46,12 +45,14 @@ public class UserInfoApi {
@Autowired
private ProductionTaskListService productionTaskListService;
private TaskService taskService;
@Autowired
private FailedinfoService failedinfoService;
private FailedCardService failedCardService;
@Autowired
private GroupinfoService groupinfoService;
private GroupNoService groupNoService;
@Autowired
private PoliceStationApplyReasonService policeStationApplyReasonService;
@GET
@Path("login")
@Produces(MediaType.APPLICATION_JSON)
......@@ -367,8 +368,9 @@ public class UserInfoApi {
}
@GET
@RequestMapping("selectAllUser")
@Path("selectAllUser")
@Produces(MediaType.APPLICATION_JSON)
@RequiresPermissions("userInfo.view")
public List<UserInfo> selectAllUser() {
List<UserInfo> list = userInfoService.getAllUserInfo();
return list;
......@@ -404,14 +406,14 @@ public class UserInfoApi {
public String addFailedinfo(@RequestParam("id") String id, @Context HttpServletResponse resp){
String map ="[{\"failedinfoid\":\"20181016002\",\"failed_Reason\":1,\"groupno\":\"41108201\",\"cyclesheetid\":\"20181016001\"}]";
JSONArray jsonArray = JSONArray.fromObject(map);
List<FailedinfoEntity> failedinfoEntityList = new ArrayList<>();
List<FailedCardEntity> failedinfoEntityList = new ArrayList<>();
for (Object object: jsonArray) {
FailedinfoEntity o = (FailedinfoEntity) JSONObject.toBean((JSONObject) object, FailedinfoEntity.class);
FailedCardEntity o = (FailedCardEntity) JSONObject.toBean((JSONObject) object, FailedCardEntity.class);
failedinfoEntityList.add(o);
}
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
int i = failedinfoService.saveFailedinfo(failedinfoEntityList);
int i = failedCardService.saveFailedinfo(failedinfoEntityList);
yxjsonResponse.outPutSuccess(i+"添加成功");
return yxjsonResponse.toJSONString();
}
......@@ -427,14 +429,14 @@ public class UserInfoApi {
public String updateFailedinfo(@RequestParam("id") String id, @Context HttpServletResponse resp){
String map ="[{\"failedinfoid\":\"201810302\",\"failed_Reason\":1,\"groupno\":\"411081\",\"cyclesheetid\":\"20181016001\"}]";
JSONArray jsonArray = JSONArray.fromObject(map);
List<FailedinfoEntity> failedinfoEntityList = new ArrayList<>();
List<FailedCardEntity> failedinfoEntityList = new ArrayList<>();
for (Object object: jsonArray) {
FailedinfoEntity o = (FailedinfoEntity) JSONObject.toBean((JSONObject) object, FailedinfoEntity.class);
FailedCardEntity o = (FailedCardEntity) JSONObject.toBean((JSONObject) object, FailedCardEntity.class);
failedinfoEntityList.add(o);
}
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
int i = failedinfoService.updateFailedinfo(failedinfoEntityList);
int i = failedCardService.updateFailedinfo(failedinfoEntityList);
yxjsonResponse.outPutSuccess(i+"更新成功");
return yxjsonResponse.toJSONString();
}
......@@ -450,7 +452,7 @@ public class UserInfoApi {
public String findFailedinfo(@RequestParam("id") String id, @Context HttpServletResponse resp){
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
List<Map<String, Object>> maps = failedinfoService.selectFailedinfo(Integer.valueOf(id));
List<Map<String, Object>> maps = failedCardService.selectFailedinfo(Integer.valueOf(id));
yxjsonResponse.outPutSuccess(maps+"------添加成功---"+maps.size());
return yxjsonResponse.toJSONString();
}
......@@ -466,7 +468,7 @@ public class UserInfoApi {
public String findProductionTaskListByState(@QueryParam("state") String state, @Context HttpServletResponse resp){
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
List<Map<String, Object>> productionTaskInfoList = productionTaskListService.findProductionTaskListEntityByState(Integer.valueOf(state));
List<Map<String, Object>> productionTaskInfoList = taskService.findProductionTaskListEntityByState(Integer.valueOf(state));
yxjsonResponse.outPutSuccess(productionTaskInfoList);
return yxjsonResponse.toJSONString();
}
......@@ -482,11 +484,27 @@ public class UserInfoApi {
public String findProdCountyList(@RequestParam("cyclesheetID") String cyclesheetID, @Context HttpServletResponse resp){
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
List<Map<String, Object>> countyInfoList = groupinfoService.findCountyInfoList(cyclesheetID);
List<Map<String, Object>> countyInfoList = groupNoService.findCountyInfoList(cyclesheetID);
yxjsonResponse.outPutSuccess(countyInfoList);
return yxjsonResponse.toJSONString();
}
/**
* 保存派出所申请类型数量;
* @return
*/
@GET
@Path("savePoliceApplyCount")
@Produces(MediaType.APPLICATION_JSON)
@RequiresPermissions("userInfo.add")//权限管理;
public String savePoliceApplyCount(@QueryParam("cyclesheetID") String cyclesheetID, @Context HttpServletResponse resp){
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
int i = policeStationApplyReasonService.savePoliceStationApplyReasonEntity(cyclesheetID);
yxjsonResponse.outPutSuccess(i+"");
return yxjsonResponse.toJSONString();
}
/**
* 下载装箱单
......@@ -496,17 +514,17 @@ public class UserInfoApi {
@Produces(MediaType.APPLICATION_OCTET_STREAM)
@Consumes(MediaType.APPLICATION_JSON)
// @RequiresPermissions("userInfo.add")//权限管理;
public byte[] printPackingList(@QueryParam("cyclesheetID") String cyclesheetID, @Context HttpServletResponse response) {
public byte[] printPackingList(@QueryParam("cyclesheetID") String taskID, @Context 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>> countyInfoList = groupinfoService.findCountyInfoList(cyclesheetID);
List<ProductionTaskListEntity> productionTaskListEntityList = productionTaskListService.findProductionTaskListEntityByID(cyclesheetID);
fout = exportExcel(countyInfoList, productionTaskListEntityList.get(0).getMake_Type()+"", productionTaskListEntityList.get(0).getWorkshop(), 6000, productionTaskListEntityList.get(0).getCitycode() ,dateTime,cyclesheetID);
String outFile = dateTime + productionTaskListEntityList.get(0).getCitycode() + "二代身份证统计表";
List<Map<String, Object>> countyInfoList = groupNoService.findCountyInfoList(taskID);
List<TaskEntity> taskEntities = taskService.findProductionTaskListEntityByID(Long.valueOf(taskID));
fout = exportExcel(countyInfoList, taskEntities.get(0).getCard_Type()+"", "p1", 6000, taskEntities.get(0).getCitycode() ,dateTime,taskID);
String outFile = dateTime + taskEntities.get(0).getCitycode() + "二代身份证统计表";
try {
FileInputStream fis = new FileInputStream(new File(fout));
byte[] b = new byte[fis.available()];
......
src/main/java/com/yxproject/start/config/MyShiroRealm.java
View file @ 0806c189
package com.yxproject.start.config;
import com.yxproject.start.entity.ProductionTaskListEntity;
import com.yxproject.start.entity.SysPermission;
import com.yxproject.start.entity.SysRole;
import com.yxproject.start.entity.UserInfo;
import com.yxproject.start.service.ProductionTaskListService;
import com.yxproject.start.service.TaskService;
import com.yxproject.start.service.LoginService;
import com.yxproject.start.service.UserInfoService;
import org.apache.shiro.authc.AuthenticationException;
......@@ -28,7 +27,7 @@ public class MyShiroRealm extends AuthorizingRealm {
private UserInfoService userInfoService;
@Autowired
private ProductionTaskListService productionTaskListService;
private TaskService taskService;
@Autowired
private LoginService loginService;
@Override
......
src/main/java/com/yxproject/start/entity/CardBodyEntity.java 0 → 100644
View file @ 0806c189
package com.yxproject.start.entity;
import javax.persistence.*;
import java.sql.Time;
import java.util.Objects;
/**
* Created by zhangyusheng on 2018/11/16 10:51
*/
@Entity
@Table(name = "CARD_BODY", schema = "DAHAI", catalog = "")
public class CardBodyEntity {
private long cardBodyId;
private Time saveDate;
private long isActive;
private long totalCount;
@Id
@Column(name = "CARD_BODY_ID", nullable = false, precision = 0)
public long getCardBodyId() {
return cardBodyId;
}
public void setCardBodyId(long cardBodyId) {
this.cardBodyId = cardBodyId;
}
@Basic
@Column(name = "SAVE_DATE", nullable = false)
public Time getSaveDate() {
return saveDate;
}
public void setSaveDate(Time saveDate) {
this.saveDate = saveDate;
}
@Basic
@Column(name = "IS_ACTIVE", nullable = false, precision = 0)
public long getIsActive() {
return isActive;
}
public void setIsActive(long isActive) {
this.isActive = isActive;
}
@Basic
@Column(name = "TOTAL_COUNT", nullable = false, precision = 0)
public long getTotalCount() {
return totalCount;
}
public void setTotalCount(long totalCount) {
this.totalCount = totalCount;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
CardBodyEntity that = (CardBodyEntity) o;
return cardBodyId == that.cardBodyId &&
isActive == that.isActive &&
totalCount == that.totalCount &&
Objects.equals(saveDate, that.saveDate);
}
@Override
public int hashCode() {
return Objects.hash(cardBodyId, saveDate, isActive, totalCount);
}
}
src/main/java/com/yxproject/start/entity/CityDicEntity.java 0 → 100644
View file @ 0806c189
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/CountyListEntity.java 0 → 100644
View file @ 0806c189
package com.yxproject.start.entity;
import javax.persistence.*;
import java.sql.Time;
import java.util.Objects;
/**
* Created by zhangyusheng on 2018/11/16 10:51
*/
@Entity
@Table(name = "COUNTY_LIST", schema = "DAHAI", catalog = "")
public class CountyListEntity {
private long countyListId;
private Time saveDate;
private Long finishCount;
private Long inStorageCount;
private Long outStorageCount;
@Id
@Column(name = "COUNTY_LIST_ID", nullable = false, precision = 0)
public long getCountyListId() {
return countyListId;
}
public void setCountyListId(long countyListId) {
this.countyListId = countyListId;
}
@Basic
@Column(name = "SAVE_DATE", nullable = false)
public Time getSaveDate() {
return saveDate;
}
public void setSaveDate(Time saveDate) {
this.saveDate = saveDate;
}
@Basic
@Column(name = "FINISH_COUNT", nullable = true, precision = 0)
public Long getFinishCount() {
return finishCount;
}
public void setFinishCount(Long finishCount) {
this.finishCount = finishCount;
}
@Basic
@Column(name = "IN_STORAGE_COUNT", nullable = true, precision = 0)
public Long getInStorageCount() {
return inStorageCount;
}
public void setInStorageCount(Long inStorageCount) {
this.inStorageCount = inStorageCount;
}
@Basic
@Column(name = "OUT_STORAGE_COUNT", nullable = true, precision = 0)
public Long getOutStorageCount() {
return outStorageCount;
}
public void setOutStorageCount(Long outStorageCount) {
this.outStorageCount = outStorageCount;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
CountyListEntity that = (CountyListEntity) o;
return countyListId == that.countyListId &&
Objects.equals(saveDate, that.saveDate) &&
Objects.equals(finishCount, that.finishCount) &&
Objects.equals(inStorageCount, that.inStorageCount) &&
Objects.equals(outStorageCount, that.outStorageCount);
}
@Override
public int hashCode() {
return Objects.hash(countyListId, saveDate, finishCount, inStorageCount, outStorageCount);
}
}
src/main/java/com/yxproject/start/entity/FailedinfoEntity.java → src/main/java/com/yxproject/start/entity/FailedCardEntity.java
View file @ 0806c189
package com.yxproject.start.entity;
import javax.persistence.*;
import java.sql.Time;
import java.util.Date;
import java.util.Objects;
/**
* Created by zhangyusheng on 2018/10/30 9:02
* Created by zhangyusheng on 2018/11/16 10:51
*/
@Entity
@Table(name = "FAILEDINFO", schema = "DAHAI", catalog = "")
public class FailedinfoEntity {
private String failedinfoid;
private long failed_Reason;
private String groupno;
private String cyclesheetid;
private String position_Date;
private String finish_Date;
private String allot_Date;
private String print_Date;
@Table(name = "FAILED_CARD", schema = "DAHAI")
public class FailedCardEntity {
private long failed_Card_Id;
private long failed_Card_Reason_Id;
private String accept_No;
private long task_Id;
private Date position_Date;
private Date finish_Date;
private Date allot_Date;
private Date print_Date;
private long state;
@Id
@Column(name = "FAILEDINFOID", nullable = false, length = 20)
public String getFailedinfoid() {
return failedinfoid;
@Column(name = "FAILED_CARD_ID", nullable = false, precision = 0)
public long getFailed_Card_Id() {
return failed_Card_Id;
}
public void setFailedinfoid(String failedinfoid) {
this.failedinfoid = failedinfoid;
public void setFailed_Card_Id(long failed_Card_Id) {
this.failed_Card_Id = failed_Card_Id;
}
@Basic
@Column(name = "FAILED_REASON", nullable = true, precision = 0)
public long getFailed_Reason() {
return failed_Reason;
@Column(name = "FAILED_CARD_REASON_ID", nullable = true, precision = 0)
public long getFailed_Card_Reason_Id() {
return failed_Card_Reason_Id;
}
public void setFailed_Reason(long failed_Reason) {
this.failed_Reason = failed_Reason;
public void setFailed_Card_Reason_Id(long failed_Card_Reason_Id) {
this.failed_Card_Reason_Id = failed_Card_Reason_Id;
}
@Basic
@Column(name = "GROUPNO", nullable = true, length = 20)
public String getGroupno() {
return groupno;
@Column(name = "ACCEPT_NO", nullable = true, length = 20)
public String getAccept_No() {
return accept_No;
}
public void setGroupno(String groupno) {
this.groupno = groupno;
public void setAccept_No(String accept_No) {
this.accept_No = accept_No;
}
@Basic
@Column(name = "CYCLESHEETID", nullable = true, length = 20)
public String getCyclesheetid() {
return cyclesheetid;
@Column(name = "TASK_ID", nullable = false, precision = 0)
public long getTask_Id() {
return task_Id;
}
public void setCyclesheetid(String cyclesheetid) {
this.cyclesheetid = cyclesheetid;
public void setTask_Id(long task_Id) {
this.task_Id = task_Id;
}
@Basic
@Column(name = "POSITION_DATE", nullable = true, length = 20)
public String getPosition_Date() {
public Date getPosition_Date() {
return position_Date;
}
public void setPosition_Date(String position_Date) {
public void setPosition_Date(Date position_Date) {
this.position_Date = position_Date;
}
@Basic
@Column(name = "FINISH_DATE", nullable = true, length = 20)
public String getFinish_Date() {
public Date getFinish_Date() {
return finish_Date;
}
public void setFinish_Date(String finish_Date) {
public void setFinish_Date(Date finish_Date) {
this.finish_Date = finish_Date;
}
@Basic
@Column(name = "ALLOT_DATE", nullable = true, length = 20)
public String getAllot_Date() {
public Date getAllot_Date() {
return allot_Date;
}
public void setAllot_Date(String allot_Date) {
public void setAllot_Date(Date allot_Date) {
this.allot_Date = allot_Date;
}
@Basic
@Column(name = "PRINT_DATE", nullable = true, length = 20)
public String getPrint_Date() {
public Date getPrint_Date() {
return print_Date;
}
public void setPrint_Date(String print_Date) {
public void setPrint_Date(Date print_Date) {
this.print_Date = print_Date;
}
@Basic
@Column(name = "STATE", nullable = false, precision = 0)
public long getState() {
......@@ -115,11 +115,11 @@ public class FailedinfoEntity {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
FailedinfoEntity that = (FailedinfoEntity) o;
return Objects.equals(failedinfoid, that.failedinfoid) &&
Objects.equals(failed_Reason, that.failed_Reason) &&
Objects.equals(groupno, that.groupno) &&
Objects.equals(cyclesheetid, that.cyclesheetid) &&
FailedCardEntity that = (FailedCardEntity) o;
return Objects.equals(failed_Card_Id, that.failed_Card_Id) &&
Objects.equals(failed_Card_Reason_Id, that.failed_Card_Reason_Id) &&
Objects.equals(accept_No, that.accept_No) &&
Objects.equals(task_Id, that.task_Id) &&
Objects.equals(position_Date, that.position_Date) &&
Objects.equals(allot_Date, that.allot_Date) &&
Objects.equals(print_Date, that.print_Date) &&
......@@ -130,8 +130,7 @@ public class FailedinfoEntity {
@Override
public int hashCode() {
return Objects.hash(failedinfoid, failed_Reason, groupno, cyclesheetid, position_Date, finish_Date, allot_Date, print_Date, state);
return Objects.hash(failed_Card_Id, failed_Card_Reason_Id, accept_No, task_Id, position_Date, finish_Date, allot_Date, print_Date, state);
}
}
src/main/java/com/yxproject/start/entity/GroupNoEntity.java 0 → 100644
View file @ 0806c189
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Objects;
/**
* Created by zhangyusheng on 2018/11/16 10:51
*/
@Entity
@Table(name = "GROUP_NO", schema = "DAHAI", catalog = "")
public class GroupNoEntity {
private long group_Id;
private long task_Id;
private String group_No;
private long vaild_Count;
private long invalid_Count;
private long special_Card_Count;
@Basic
@Column(name = "GROUP_ID", nullable = false, precision = 0)
public long getGroup_Id() {
return group_Id;
}
public void setGroup_Id(long group_Id) {
this.group_Id = group_Id;
}
@Basic
@Column(name = "TASK_ID", nullable = false, precision = 0)
public long getTask_Id() {
return task_Id;
}
public void setTask_Id(long task_Id) {
this.task_Id = task_Id;
}
@Id
@Column(name = "GROUP_NO", nullable = false, length = 8)
public String getGroup_No() {
return group_No;
}
public void setGroup_No(String group_No) {
this.group_No = group_No;
}
@Basic
@Column(name = "VAILD_COUNT", nullable = false, precision = 0)
public long getVaild_Count() {
return vaild_Count;
}
public void setVaild_Count(long vaild_Count) {
this.vaild_Count = vaild_Count;
}
@Basic
@Column(name = "INVALID_COUNT", nullable = false, precision = 0)
public long getInvalid_Count() {
return invalid_Count;
}
public void setInvalid_Count(long invalid_Count) {
this.invalid_Count = invalid_Count;
}
@Basic
@Column(name = "SPECIAL_CARD_COUNT", nullable = false, precision = 0)
public long getSpecial_Card_Count() {
return special_Card_Count;
}
public void setSpecial_Card_Count(long special_Card_Count) {
this.special_Card_Count = special_Card_Count;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
GroupNoEntity that = (GroupNoEntity) o;
return group_Id == that.group_Id &&
vaild_Count == that.vaild_Count &&
invalid_Count == that.invalid_Count &&
special_Card_Count == that.special_Card_Count &&
task_Id == that.task_Id &&
Objects.equals(group_No, that.group_No);
}
@Override
public int hashCode() {
return Objects.hash(group_Id, group_No, task_Id, vaild_Count, invalid_Count,special_Card_Count);
}
}
src/main/java/com/yxproject/start/entity/GroupinfoEntity.java deleted 100644 → 0
View file @ f08b7894
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Objects;
@Entity
@Table(name = "GROUPINFO", schema = "DAHAI", catalog = "")
public class GroupinfoEntity {
private String groupid;
private String groupno;
private String cyclesheetid;
private Long valid_Count;
private Long invalid_Count;
private Long special_Card_Count;
@Id
@Column(name = "GROUPID", nullable = false, length = 20)
public String getGroupid() {
return groupid;
}
public void setGroupid(String groupid) {
this.groupid = groupid;
}
@Basic
@Column(name = "GROUPNO", nullable = true, length = 20)
public String getGroupno() {
return groupno;
}
public void setGroupno(String groupno) {
this.groupno = groupno;
}
@Basic
@Column(name = "CYCLESHEETID", nullable = true, length = 20)
public String getCyclesheetid() {
return cyclesheetid;
}
public void setCyclesheetid(String cyclesheetid) {
this.cyclesheetid = cyclesheetid;
}
@Basic
@Column(name = "VAILD_COUNT", nullable = true, precision = 0)
public Long getValid_Count() {
return valid_Count;
}
public void setValid_Count(Long valid_Count) {
this.valid_Count = valid_Count;
}
@Basic
@Column(name = "INVALID_COUNT", nullable = true, precision = 0)
public Long getInvalid_Count() {
return invalid_Count;
}
public void setInvalid_Count(Long invalid_Count) {
this.invalid_Count = invalid_Count;
}
@Basic
@Column(name = "SPECIAL_CARD_COUNT", nullable = true, precision = 0)
public Long getSpecial_Card_Count() {
return special_Card_Count;
}
public void setSpecial_Card_Count(Long special_Card_Count) {
this.special_Card_Count = special_Card_Count;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
GroupinfoEntity that = (GroupinfoEntity) o;
return Objects.equals(groupid, that.groupid) &&
Objects.equals(groupno, that.groupno) &&
Objects.equals(cyclesheetid, that.cyclesheetid) &&
Objects.equals(valid_Count, that.valid_Count) &&
Objects.equals(special_Card_Count, that.special_Card_Count) &&
Objects.equals(invalid_Count, that.invalid_Count);
}
@Override
public int hashCode() {
return Objects.hash(groupid, groupno, cyclesheetid, valid_Count, special_Card_Count,invalid_Count);
}
}
src/main/java/com/yxproject/start/entity/PoliceStationApplyReasonEntity.java 0 → 100644
View file @ 0806c189
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Date;
import java.util.Objects;
/**
* Created by zhangyusheng on 2018/11/12 14:12
*/
@Entity
@Table(name = "POLICE_STATION_APPLY_REASON", schema = "DAHAI", catalog = "")
public class PoliceStationApplyReasonEntity {
private Long police_Station_Apply_Reason_Id;
private Date save_Date;
private Long task_Id;
private String police_Station_Code;
private Long apply_Code;
private Long apply_Count;
@Id
@Column(name = "POLICE_STATION_APPLY_REASON_ID", nullable = false, precision = 0)
public Long getPolice_Station_Apply_Reason_Id() {
return police_Station_Apply_Reason_Id;
}
public void setPolice_Station_Apply_Reason_Id(Long police_Station_Apply_Reason_Id) {
this.police_Station_Apply_Reason_Id = police_Station_Apply_Reason_Id;
}
@Basic
@Column(name = "SAVE_DATE", nullable = true)
public Date getSave_Date() {
return save_Date;
}
public void setSave_Date(Date save_Date) {
this.save_Date = save_Date;
}
@Basic
@Column(name = "TASK_ID", nullable = false, precision = 0)
public Long getTask_Id() {
return task_Id;
}
public void setTask_Id(Long task_Id) {
this.task_Id = task_Id;
}
@Basic
@Column(name = "POLICE_STATION_CODE", nullable = true, length = 20)
public String getPolice_Station_Code() {
return police_Station_Code;
}
public void setPolice_Station_Code(String police_Station_Code) {
this.police_Station_Code = police_Station_Code;
}
@Basic
@Column(name = "APPLY_CODE", nullable = true, precision = 0)
public Long getApply_Code() {
return apply_Code;
}
public void setApply_Code(Long apply_Code) {
this.apply_Code = apply_Code;
}
@Basic
@Column(name = "APPLY_COUNT", nullable = true, precision = 0)
public Long getApply_Count() {
return apply_Count;
}
public void setApply_Count(Long apply_Count) {
this.apply_Count = apply_Count;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
PoliceStationApplyReasonEntity that = (PoliceStationApplyReasonEntity) o;
return Objects.equals(police_Station_Apply_Reason_Id, that.police_Station_Apply_Reason_Id) &&
Objects.equals(save_Date, that.save_Date) &&
Objects.equals(task_Id, that.task_Id) &&
Objects.equals(police_Station_Code, that.police_Station_Code) &&
Objects.equals(apply_Code, that.apply_Code) &&
Objects.equals(apply_Count, that.apply_Count);
}
@Override
public int hashCode() {
return Objects.hash(police_Station_Apply_Reason_Id, save_Date, task_Id, police_Station_Code, apply_Code, apply_Count);
}
}
src/main/java/com/yxproject/start/entity/PoliceStationVailedInfoEntity.java → src/main/java/com/yxproject/start/entity/PoliceStationVailedEntity.java
View file @ 0806c189
package com.yxproject.start.entity;
import javax.persistence.*;
import java.sql.Time;
import java.util.Date;
import java.util.Objects;
/**
* Created by zhangyusheng on 2018/10/25 13:38
* Created by zhangyusheng on 2018/11/16 10:51
*/
@Entity
@Table(name = "POLICE_STATION_VAILED_INFO", schema = "DAHAI", catalog = "")
public class PoliceStationVailedInfoEntity {
private String police_Station_Vailed_Info_Id;
private String cyclesheetid;
@Table(name = "POLICE_STATION_VAILED", schema = "DAHAI", catalog = "")
public class PoliceStationVailedEntity {
private long police_Station_Vailed_Id;
private long task_Id;
private String police_Station_Code;
private Long vailed_Count;
private Long invalid_Count;
private String sava_Date;
private long vailed_Count;
private long invalid_Count;
private Date sava_Date;
@Id
@Column(name = "POLICE_STATION_VAILED_INFO_ID", nullable = false, length = 20)
public String getPolice_Station_Vailed_Info_Id() {
return police_Station_Vailed_Info_Id;
@Column(name = "POLICE_STATION_VAILED_ID", nullable = false, precision = 0)
public long getPolice_Station_Vailed_Id() {
return police_Station_Vailed_Id;
}
public void setPolice_Station_Vailed_Info_Id(String police_Station_Vailed_Info_Id) {
this.police_Station_Vailed_Info_Id = police_Station_Vailed_Info_Id;
public void setPolice_Station_Vailed_Id(long police_Station_Vailed_Id) {
this.police_Station_Vailed_Id = police_Station_Vailed_Id;
}
@Basic
@Column(name = "CYCLESHEETID", nullable = true, precision = 0)
public String getCyclesheetid() {
return cyclesheetid;
@Column(name = "TASK_ID", nullable = false, precision = 0)
public long getTask_Id() {
return task_Id;
}
public void setCyclesheetid(String cyclesheetid) {
this.cyclesheetid = cyclesheetid;
public void setTask_Id(long task_Id) {
this.task_Id = task_Id;
}
@Basic
@Column(name = "POLICE_STATION_CODE", nullable = true, precision = 0)
@Column(name = "POLICE_STATION_CODE", nullable = true, length = 20)
public String getPolice_Station_Code() {
return police_Station_Code;
}
......@@ -47,50 +46,57 @@ public class PoliceStationVailedInfoEntity {
}
@Basic
@Column(name = "VAILED_COUNT", nullable = true, precision = 0)
public Long getVailed_Count() {
@Column(name = "INVALID_COUNT", nullable = false, precision = 0)
public long getVailed_Count() {
return vailed_Count;
}
public void setVailed_Count(Long vailed_Count) {
public void setVailed_Count(long vailed_Count) {
this.vailed_Count = vailed_Count;
}
@Basic
@Column(name = "INVALID_COUNT", nullable = true, precision = 0)
public Long getInvalid_Count() {
@Column(name = "VAILED_COUNT", nullable = false, precision = 0)
public long getInvalid_Count() {
return invalid_Count;
}
public void setInvalid_Count(Long invalid_Count) {
public void setInvalid_Count(long invalid_Count) {
this.invalid_Count = invalid_Count;
}
@Basic
@Column(name = "SAVA_DATE", nullable = true, length = 20)
public String getSava_Date() {
@Column(name = "SAVA_DATE", nullable = false)
public Date getSava_Date() {
return sava_Date;
}
public void setSava_Date(String sava_Date) {
public void setSava_Date(Date sava_Date) {
this.sava_Date = sava_Date;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
PoliceStationVailedInfoEntity that = (PoliceStationVailedInfoEntity) o;
return Objects.equals(police_Station_Vailed_Info_Id, that.police_Station_Vailed_Info_Id) &&
Objects.equals(cyclesheetid, that.cyclesheetid) &&
Objects.equals(police_Station_Code, that.police_Station_Code) &&
Objects.equals(vailed_Count, that.vailed_Count) &&
Objects.equals(invalid_Count, that.invalid_Count) &&
PoliceStationVailedEntity that = (PoliceStationVailedEntity) o;
return police_Station_Vailed_Id == that.police_Station_Vailed_Id &&
task_Id == that.task_Id &&
vailed_Count == that.vailed_Count &&
invalid_Count == that.invalid_Count &&
Objects.equals(police_Station_Code, that.police_Station_Code)&&
Objects.equals(sava_Date, that.sava_Date);
}
@Override
public int hashCode() {
return Objects.hash(police_Station_Vailed_Info_Id, cyclesheetid, police_Station_Code, vailed_Count, invalid_Count, sava_Date);
return Objects.hash(police_Station_Vailed_Id, task_Id, police_Station_Code, vailed_Count,invalid_Count,sava_Date);
}
}
src/main/java/com/yxproject/start/entity/ProductionTaskListEntity.java deleted 100644 → 0
View file @ f08b7894
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Objects;
@Entity
@Table(name = "PRODUCTION_TASK_LIST", schema = "DAHAI", catalog = "")
public class ProductionTaskListEntity {
private String production_Task_List_Id;
private long make_Type;
private Long old_Make_Type;
private String workshop;
private String citycode;
private String submit_Date;
private String handout_Date;
private Long is_Print;
private String download_Date;
private String print_Out;
private String permanent_Position_Date;
private String roll_Out_Workshop_Date;
private String qualityinspection_Name;
private String qualityinspection_Date;
private String exception_Information;
private String outbound_Date;
private String putinstorage_Date;
private Long state;
@Id
@Column(name = "PRODUCTION_TASK_LIST_ID", nullable = false, length = 20)
public String getProduction_Task_List_Id() {
return production_Task_List_Id;
}
public void setProduction_Task_List_Id(String production_Task_List_Id) {
this.production_Task_List_Id = production_Task_List_Id;
}
@Basic
@Column(name = "MAKE_TYPE", nullable = false, precision = 0)
public long getMake_Type() {
return make_Type;
}
public void setMake_Type(long make_Type) {
this.make_Type = make_Type;
}
@Basic
@Column(name = "OLD_MAKE_TYPE", nullable = true, precision = 0)
public Long getOld_Make_Type() {
return old_Make_Type;
}
public void setOld_Make_Type(Long old_Make_Type) {
this.old_Make_Type = old_Make_Type;
}
@Basic
@Column(name = "CITYCODE",nullable = true, length = 8)
public String getCitycode() {
return citycode;
}
public void setCitycode(String citycode) {
this.citycode = citycode;
}
@Basic
@Column(name = "WORKSHOP", nullable = true, length = 2)
public String getWorkshop() {
return workshop;
}
public void setWorkshop(String workshop) {
this.workshop = workshop;
}
@Basic
@Column(name = "SUBMIT_DATE", nullable = true, length = 8)
public String getSubmit_Date() {
return submit_Date;
}
public void setSubmit_Date(String submit_Date) {
this.submit_Date = submit_Date;
}
@Basic
@Column(name = "HANDOUT_DATE", nullable = true, length = 8)
public String getHandout_Date() {
return handout_Date;
}
public void setHandout_Date(String handout_Date) {
this.handout_Date = handout_Date;
}
@Basic
@Column(name = "IS_PRINT", nullable = true, precision = 0)
public Long getIs_Print() {
return is_Print;
}
public void setIs_Print(Long is_Print) {
this.is_Print = is_Print;
}
@Basic
@Column(name = "DOWNLOAD_DATE", nullable = true, length = 8)
public String getDownload_Date() {
return download_Date;
}
public void setDownload_Date(String download_Date) {
this.download_Date = download_Date;
}
@Basic
@Column(name = "PRINT_OUT", nullable = true, length = 8)
public String getPrint_Out() {
return print_Out;
}
public void setPrint_Out(String print_Out) {
this.print_Out = print_Out;
}
@Basic
@Column(name = "PERMANENT_POSITION_DATE", nullable = true, length = 8)
public String getPermanent_Position_Date() {
return permanent_Position_Date;
}
public void setPermanent_Position_Date(String permanent_Position_Date) {
this.permanent_Position_Date = permanent_Position_Date;
}
@Basic
@Column(name = "ROLL_OUT_WORKSHOP_DATE", nullable = true, length = 8)
public String getRoll_Out_Workshop_Date() {
return roll_Out_Workshop_Date;
}
public void setRoll_Out_Workshop_Date(String roll_Out_Workshop_Date) {
this.roll_Out_Workshop_Date = roll_Out_Workshop_Date;
}
@Basic
@Column(name = "QUALITYINSPECTION_NAME", nullable = true, length = 20)
public String getQualityinspection_Name() {
return qualityinspection_Name;
}
public void setQualityinspection_Name(String qualityinspection_Name) {
this.qualityinspection_Name = qualityinspection_Name;
}
@Basic
@Column(name = "QUALITYINSPECTION_DATE", nullable = true, length = 8)
public String getQualityinspection_Date() {
return qualityinspection_Date;
}
public void setQualityinspection_Date(String qualityinspection_Date) {
this.qualityinspection_Date = qualityinspection_Date;
}
@Basic
@Column(name = "EXCEPTION_INFORMATION", nullable = true, length = 120)
public String getException_Information() {
return exception_Information;
}
public void setException_Information(String exception_Information) {
this.exception_Information = exception_Information;
}
@Basic
@Column(name = "OUTBOUND_DATE", nullable = true, length = 8)
public String getOutbound_Date() {
return outbound_Date;
}
public void setOutbound_Date(String outbound_Date) {
this.outbound_Date = outbound_Date;
}
@Basic
@Column(name = "PUTINSTORAGE_DATE", nullable = true, length = 8)
public String getPutinstorage_Date() {
return putinstorage_Date;
}
public void setPutinstorage_Date(String putinstorage_Date) {
this.putinstorage_Date = putinstorage_Date;
}
@Basic
@Column(name = "STATE", nullable = true, precision = 0)
public Long getState() {
return state;
}
public void setState(Long state) {
this.state = state;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ProductionTaskListEntity that = (ProductionTaskListEntity) o;
return make_Type == that.make_Type &&
Objects.equals(production_Task_List_Id, that.production_Task_List_Id) &&
Objects.equals(old_Make_Type, that.old_Make_Type) &&
Objects.equals(citycode, that.citycode) &&
Objects.equals(workshop, that.workshop) &&
Objects.equals(submit_Date, that.submit_Date) &&
Objects.equals(handout_Date, that.handout_Date) &&
Objects.equals(is_Print, that.is_Print) &&
Objects.equals(download_Date, that.download_Date) &&
Objects.equals(print_Out, that.print_Out) &&
Objects.equals(permanent_Position_Date, that.permanent_Position_Date) &&
Objects.equals(roll_Out_Workshop_Date, that.roll_Out_Workshop_Date) &&
Objects.equals(qualityinspection_Name, that.qualityinspection_Name) &&
Objects.equals(qualityinspection_Date, that.qualityinspection_Date) &&
Objects.equals(exception_Information, that.exception_Information) &&
Objects.equals(outbound_Date, that.outbound_Date) &&
Objects.equals(state, that.state) &&
Objects.equals(putinstorage_Date, that.putinstorage_Date);
}
@Override
public int hashCode() {
return Objects.hash(production_Task_List_Id, make_Type, old_Make_Type, citycode,workshop, submit_Date, handout_Date, is_Print, download_Date, print_Out, permanent_Position_Date, roll_Out_Workshop_Date, qualityinspection_Name, qualityinspection_Date, exception_Information, outbound_Date, putinstorage_Date,state);
}
}
src/main/java/com/yxproject/start/entity/AcceptNoInfoEntity.java → src/main/java/com/yxproject/start/entity/SpecialCardEntity.java
View file @ 0806c189
......@@ -4,29 +4,29 @@ import javax.persistence.*;
import java.util.Objects;
/**
* Created by zhangyusheng on 2018/11/7 14:04
* Created by zhangyusheng on 2018/11/19 10:43
*/
@Entity
@Table(name = "ACCEPT_NO_INFO", schema = "DAHAI", catalog = "")
public class AcceptNoInfoEntity {
private String accept_No_Info_Id;
@Table(name = "SPECIAL_CARD", schema = "DAHAI")
public class SpecialCardEntity {
private long special_Card_Id;
private String accept_No;
private String cyclesheetid;
private Long accept_Type;
private long task_Id;
private long special_Type;
private String group_No;
@Id
@Column(name = "ACCEPT_NO_INFO_ID", nullable = false, length = 20)
public String getAccept_No_Info_Id() {
return accept_No_Info_Id;
@Column(name = "SPECIAL_CARD_ID", nullable = false, precision = 0)
public long getSpecial_Card_Id() {
return special_Card_Id;
}
public void setAccept_No_Info_Id(String accept_No_Info_Id) {
this.accept_No_Info_Id = accept_No_Info_Id;
public void setSpecial_Card_Id(long special_Card_Id) {
this.special_Card_Id = special_Card_Id;
}
@Basic
@Column(name = "ACCEPT_NO", nullable = true, length = 20)
@Column(name = "ACCEPT_NO", nullable = false, length = 10)
public String getAccept_No() {
return accept_No;
}
......@@ -36,26 +36,26 @@ public class AcceptNoInfoEntity {
}
@Basic
@Column(name = "ACCEPT_TYPE", nullable = true, precision = 0)
public Long getAccept_Type() {
return accept_Type;
@Column(name = "TASK_ID", nullable = false, precision = 0)
public long getTask_Id() {
return task_Id;
}
public void setAccept_Type(Long accept_Type) {
this.accept_Type = accept_Type;
public void setTask_Id(long task_Id) {
this.task_Id = task_Id;
}
@Basic
@Column(name = "CYCLESHEETID", nullable = true, length = 20)
public String getCyclesheetid() {
return cyclesheetid;
@Column(name = "SPECIAL_TYPE", nullable = false, precision = 0)
public long getSpecial_Type() {
return special_Type;
}
public void setCyclesheetid(String cyclesheetid) {
this.cyclesheetid = cyclesheetid;
public void setSpecial_Type(long special_Type) {
this.special_Type = special_Type;
}
@Basic
@Column(name = "GROUP_NO", nullable = true, length = 20)
@Column(name = "GROUP_NO", nullable = false, length = 10)
public String getGroup_No() {
return group_No;
}
......@@ -64,23 +64,20 @@ public class AcceptNoInfoEntity {
this.group_No = group_No;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
AcceptNoInfoEntity that = (AcceptNoInfoEntity) o;
return Objects.equals(accept_No_Info_Id, that.accept_No_Info_Id) &&
Objects.equals(accept_No, that.accept_No) &&
Objects.equals(cyclesheetid, that.cyclesheetid) &&
Objects.equals(group_No, that.group_No) &&
Objects.equals(accept_Type, that.accept_Type);
SpecialCardEntity that = (SpecialCardEntity) o;
return special_Card_Id == that.special_Card_Id &&
special_Type == that.special_Type &&
task_Id == that.task_Id &&
Objects.equals(accept_No, that.accept_No)&&
Objects.equals(group_No, that.group_No);
}
@Override
public int hashCode() {
return Objects.hash(accept_No_Info_Id, accept_No, cyclesheetid, accept_Type,group_No);
return Objects.hash(special_Card_Id, accept_No,task_Id,group_No, special_Type);
}
}
src/main/java/com/yxproject/start/entity/TaskEntity.java 0 → 100644
View file @ 0806c189
package com.yxproject.start.entity;
import javax.persistence.*;
import java.sql.Time;
import java.util.Date;
import java.util.Objects;
/**
* Created by zhangyusheng on 2018/11/16 10:51
*/
@Entity
@Table(name = "TASK", schema = "DAHAI")
public class TaskEntity {
private long task_Id;
private long card_Type;
private long old_Card_Type;
private String citycode;
private Date submit_Date;
private Date issued_Date;
private long print_State;
private Date download_Date;
private Date print_Out_Date;
private Date position_Date;
private Date out_Workshop_Date;
private String quality_People_Name;
private Date quality_Test_Date;
private String exception_Information;
private Date out_Storage_Date;
private Date in_Storage_Date;
private long task_State_Id;
private long is_Exception;
private long printer_Id;
@Id
@Column(name = "TASK_ID", nullable = false, precision = 0)
public long getTask_Id() {
return task_Id;
}
public void setTask_Id(long task_Id) {
this.task_Id = task_Id;
}
@Basic
@Column(name = "CARD_TYPE", nullable = false, precision = 0)
public long getCard_Type() {
return card_Type;
}
public void setCard_Type(long card_Type) {
this.card_Type = card_Type;
}
@Basic
@Column(name = "OLD_CARD_TYPE", nullable = false, precision = 0)
public long getOld_Card_Type() {
return old_Card_Type;
}
public void setOld_Card_Type(long old_Card_Type) {
this.old_Card_Type = old_Card_Type;
}
@Basic
@Column(name = "CITYCODE", nullable = true, length = 20)
public String getCitycode() {
return citycode;
}
public void setCitycode(String citycode) {
this.citycode = citycode;
}
@Basic
@Column(name = "SUBMIT_DATE", nullable = true)
public Date getSubmit_Date() {
return submit_Date;
}
public void setSubmit_Date(Date submit_Date) {
this.submit_Date = submit_Date;
}
@Basic
@Column(name = "ISSUED_DATE", nullable = true)
public Date getIssued_Date() {
return issued_Date;
}
public void setIssued_Date(Date issued_Date) {
this.issued_Date = issued_Date;
}
@Basic
@Column(name = "PRINT_STATE", nullable = true, precision = 0)
public long getPrint_State() {
return print_State;
}
public void setPrint_State(long print_State) {
this.print_State = print_State;
}
@Basic
@Column(name = "DOWNLOAD_DATE", nullable = true)
public Date getDownload_Date() {
return download_Date;
}
public void setDownload_Date(Date download_Date) {
this.download_Date = download_Date;
}
@Basic
@Column(name = "PRINT_OUT_DATE", nullable = true)
public Date getPrint_Out_Date() {
return print_Out_Date;
}
public void setPrint_Out_Date(Date print_Out_Date) {
this.print_Out_Date = print_Out_Date;
}
@Basic
@Column(name = "POSITION_DATE", nullable = true)
public Date getPosition_Date() {
return position_Date;
}
public void setPosition_Date(Date position_Date) {
this.position_Date = position_Date;
}
@Basic
@Column(name = "OUT_WORKSHOP_DATE", nullable = true)
public Date getOut_Workshop_Date() {
return out_Workshop_Date;
}
public void setOut_Workshop_Date(Date out_Workshop_Date) {
this.out_Workshop_Date = out_Workshop_Date;
}
@Basic
@Column(name = "QUALITY_PEOPLE_NAME", nullable = true, length = 20)
public String getQuality_People_Name() {
return quality_People_Name;
}
public void setQuality_People_Name(String quality_People_Name) {
this.quality_People_Name = quality_People_Name;
}
@Basic
@Column(name = "QUALITY_TEST_DATE", nullable = true)
public Date getQuality_Test_Date() {
return quality_Test_Date;
}
public void setQuality_Test_Date(Date quality_Test_Date) {
this.quality_Test_Date = quality_Test_Date;
}
@Basic
@Column(name = "EXCEPTION_INFORMATION", nullable = true, length = 120)
public String getException_Information() {
return exception_Information;
}
public void setException_Information(String exception_Information) {
this.exception_Information = exception_Information;
}
@Basic
@Column(name = "OUT_STORAGE_DATE", nullable = true)
public Date getOut_Storage_Date() {
return out_Storage_Date;
}
public void setOut_Storage_Date(Date out_Storage_Date) {
this.out_Storage_Date = out_Storage_Date;
}
@Basic
@Column(name = "IN_STORAGE_DATE", nullable = true)
public Date getIn_Storage_Date() {
return in_Storage_Date;
}
public void setIn_Storage_Date(Date in_Storage_Date) {
this.in_Storage_Date = in_Storage_Date;
}
@Basic
@Column(name = "TASK_STATE_ID", nullable = true, precision = 0)
public long getTask_State_Id() {
return task_State_Id;
}
public void setTask_State_Id(long task_State_Id) {
this.task_State_Id = task_State_Id;
}
@Basic
@Column(name = "IS_EXCEPTION", nullable = true, precision = 0)
public long getIs_Exception() {
return is_Exception;
}
public void setIs_Exception(long is_Exception) {
this.is_Exception = is_Exception;
}
@Basic
@Column(name = "PRINTER_ID", nullable = true, precision = 0)
public long getPrinter_Id() {
return printer_Id;
}
public void setPrinter_Id(long printer_Id) {
this.printer_Id = printer_Id;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
TaskEntity that = (TaskEntity) o;
return task_Id == that.task_Id &&
card_Type == that.card_Type &&
old_Card_Type == that.old_Card_Type &&
Objects.equals(citycode, that.citycode) &&
Objects.equals(submit_Date, that.submit_Date) &&
Objects.equals(issued_Date, that.issued_Date) &&
Objects.equals(print_State, that.print_State) &&
Objects.equals(download_Date, that.download_Date) &&
Objects.equals(print_Out_Date, that.print_Out_Date) &&
Objects.equals(position_Date, that.position_Date) &&
Objects.equals(out_Workshop_Date, that.out_Workshop_Date) &&
Objects.equals(quality_People_Name, that.quality_People_Name) &&
Objects.equals(quality_Test_Date, that.quality_Test_Date) &&
Objects.equals(exception_Information, that.exception_Information) &&
Objects.equals(out_Storage_Date, that.out_Storage_Date) &&
Objects.equals(in_Storage_Date, that.in_Storage_Date) &&
printer_Id == that.printer_Id &&
task_State_Id == that.task_State_Id &&
Objects.equals(is_Exception, that.is_Exception);
}
@Override
public int hashCode() {
return Objects.hash(task_Id, card_Type, old_Card_Type, citycode, submit_Date, issued_Date, print_State, download_Date, print_Out_Date, position_Date, out_Workshop_Date, quality_People_Name, quality_Test_Date, exception_Information,out_Storage_Date,in_Storage_Date,printer_Id,task_State_Id,is_Exception);
}
}
src/main/java/com/yxproject/start/mapper/AcceptNoInfoMapper.java deleted 100644 → 0
View file @ f08b7894
package com.yxproject.start.mapper;
import com.yxproject.start.entity.AcceptNoInfoEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* Created by zhangyusheng on 2018/11/7 15:06
*/
@Mapper
public interface AcceptNoInfoMapper {
public List<AcceptNoInfoEntity> findAcceptNoInfoEntityByAcceptNo(String acceptNo);
public void saveAcceptNoInfoEntity(AcceptNoInfoEntity acceptNoInfoEntity);
public void updateAcceptNoInfoEntity(AcceptNoInfoEntity acceptNoInfoEntity);
public List<AcceptNoInfoEntity> findAcceptNoInfoEntityByGroupNo(String groupNo);
}
src/main/java/com/yxproject/start/mapper/FailedinfoMapper.java → src/main/java/com/yxproject/start/mapper/FailedCardMapper.java
View file @ 0806c189
package com.yxproject.start.mapper;
import com.yxproject.start.entity.FailedinfoEntity;
import com.yxproject.start.entity.FailedCardEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......@@ -10,29 +10,29 @@ import java.util.Map;
* Created by zhangyusheng on 2018/10/30 9:42
*/
@Mapper
public interface FailedinfoMapper {
public interface FailedCardMapper {
/**
* 新增废证
* @param failedinfoEntity
* @param failedCardEntity
* @return
*/
// @InsertProvider(type=com.yxproject.start.SqlProvider.SqlProvider.class,method="saveFailedinfoEntity")
//// @Options(useGeneratedKeys=true,keyProperty="failedinfoid")
public void saveFailedinfoEntity(FailedinfoEntity failedinfoEntity);
public void saveFailedCardEntity(FailedCardEntity failedCardEntity);
/**
* 更新废证
* @param failedinfoEntity
* @param failedCardEntity
*/
// @UpdateProvider(type=com.yxproject.start.SqlProvider.SqlProvider.class,method="updateFailedinfoEntity")
public void updateFailedinfoEntity(FailedinfoEntity failedinfoEntity);
public void updateFailedCardEntity(FailedCardEntity failedCardEntity);
/**
* 查询废证详情
* @return
*/
// @SelectProvider(type=com.yxproject.start.SqlProvider.SqlProvider.class,method="selectFailedinfoBycolumnName")
public List<Map<String,Object>> selectFailedinfoByState(int state);
public List<Map<String,Object>> selectFailedCardEntityByState(int state);
......
src/main/java/com/yxproject/start/mapper/GroupinfoMapper.java → src/main/java/com/yxproject/start/mapper/GroupNoMapper.java
View file @ 0806c189
package com.yxproject.start.mapper;
import com.yxproject.start.entity.GroupinfoEntity;
import com.yxproject.start.entity.GroupNoEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......@@ -10,20 +10,20 @@ import java.util.Map;
* Created by zhangyusheng on 2018/10/13 9:36
*/
@Mapper
public interface GroupinfoMapper {
public interface GroupNoMapper {
public int insertGroupinfoEntity(GroupinfoEntity groupinfoEntity);
public int insertGroupNoEntity(GroupNoEntity groupNoEntity);
public List<GroupinfoEntity> findGroupinfoEntityByAcceptNo(String acceptNo);
public List<GroupNoEntity> findGroupNoEntityByAcceptNo(String acceptNo);
public int updateGroupinfoEntity(GroupinfoEntity groupinfoEntity);
public int updateGroupinfoEntity(GroupNoEntity groupNoEntity);
public List<GroupinfoEntity> findGroupinfoEntityListByProductionTaskListId(String cyclesheetid);
public List<GroupNoEntity> findGroupNoEntityListByTaskId(long task_Id);
public int findGroupInfoCountByProductionTaskListId(String cyclesheetid);
public int findGroupNoCountByTaskId(String task_Id);
public List<Map<String,Object>> findSpecialCountyList(String cyclesheetid);
public List<Map<String,Object>> findSpecialCountyList(String task_Id);
public List<Map<String,Object>> findNormalCountyList(String cyclesheetid);
public List<Map<String,Object>> findNormalCountyList(String task_Id);
}
src/main/java/com/yxproject/start/mapper/PoliceStationApplyReasonMapper.java 0 → 100644
View file @ 0806c189
package com.yxproject.start.mapper;
import com.yxproject.start.entity.PoliceStationApplyReasonEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
/**
* Created by zhangyusheng on 2018/11/12 14:24
*/
@Mapper
public interface PoliceStationApplyReasonMapper {
public int savePoliceStationApplyReasonEntity(PoliceStationApplyReasonEntity policeStationApplyReasonEntity);
public int updatePoliceStationApplyReasonEntity(PoliceStationApplyReasonEntity policeStationApplyReasonEntity);
public List<Map<String,Object>> findNormalApplyReasonByCyclesheetID(String cyclesheetid);
public List<Map<String,Object>> findSpecialApplyReasonByCyclesheetID(String cyclesheetid);
}
src/main/java/com/yxproject/start/mapper/PoliceStationVailedInfoMapper.java → src/main/java/com/yxproject/start/mapper/PoliceStationVailedMapper.java
View file @ 0806c189
package com.yxproject.start.mapper;
import com.yxproject.start.entity.PoliceStationVailedInfoEntity;
import com.yxproject.start.entity.PoliceStationVailedEntity;
import org.apache.ibatis.annotations.*;
import java.util.List;
......@@ -9,7 +9,7 @@ import java.util.List;
* Created by zhangyusheng on 2018/10/25 13:45
*/
@Mapper
public interface PoliceStationVailedInfoMapper {
public interface PoliceStationVailedMapper {
/**
* 保存派出所照片质量报表
* @param policeStationVailedInfoEntity
......@@ -18,7 +18,7 @@ public interface PoliceStationVailedInfoMapper {
@Insert("INSERT INTO POLICE_STATION_VAILED_INFO (POLICE_STATION_VAILED_INFO_ID,CYCLESHEETID,POLICE_STATION_CODE,VAILED_COUNT,INVALID_COUNT,SAVA_DATE) " +
"values (#{police_Station_Vailed_Info_Id},#{cyclesheetid},#{police_Station_Code},#{vailed_Count},#{invalid_Count},#{sava_Date})")
@Options(useGeneratedKeys = true, keyProperty = "police_Station_Vailed_Info_Id",keyColumn = "police_Station_Vailed_Info_Id")
public void savePoliceStationVailedInfoEntity(PoliceStationVailedInfoEntity policeStationVailedInfoEntity);
public void savePoliceStationVailedInfoEntity(PoliceStationVailedEntity policeStationVailedEntity);
@Select("select * from POLICE_STATION_VAILED_INFO WHERE POLICE_STATION_VAILED_INFO_ID=#{id}")
@Results({@Result(property = "police_Station_Vailed_Info_Id",column = "police_Station_Vailed_Info_Id"),
......@@ -27,5 +27,5 @@ public interface PoliceStationVailedInfoMapper {
@Result(property = "vailed_Count",column = "vailed_Count"),
@Result(property = "invalid_Count",column = "invalid_Count"),
@Result(property = "sava_Date",column = "sava_Date")})
public List<PoliceStationVailedInfoEntity> findPoliceStationVailedInfoEntityByID(String id);
public List<PoliceStationVailedEntity> findPoliceStationVailedEntity(String id);
}
src/main/java/com/yxproject/start/mapper/ProdCardTMapper.java
View file @ 0806c189
package com.yxproject.start.mapper;
import com.yxproject.start.entity.ProductionTaskListEntity;
import com.yxproject.start.entity.prod.ProdCardTEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.SelectProvider;
import java.util.List;
......
src/main/java/com/yxproject/start/mapper/ProductionTaskListMapper.java deleted 100644 → 0
View file @ f08b7894
package com.yxproject.start.mapper;
import com.yxproject.start.entity.ProductionTaskListEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.UpdateProvider;
import java.util.List;
/**
* Created by zhangyusheng on 2018/10/13 9:36
*/
@Mapper
public interface ProductionTaskListMapper {
public List<ProductionTaskListEntity> findProductionTaskListEntity(String id);
public int insertProductionTaskListEntity(ProductionTaskListEntity productionTaskListEntity);
public int updateProductionTask(ProductionTaskListEntity productionTaskListEntity);
public List<ProductionTaskListEntity> findProductionTaskListEntityByAcceptNo(String acceptNo);
public List<ProductionTaskListEntity> findProductionTaskListEntityByState(int state);
}
src/main/java/com/yxproject/start/mapper/SpecialCardMapper.java 0 → 100644
View file @ 0806c189
package com.yxproject.start.mapper;
import com.yxproject.start.entity.SpecialCardEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* Created by zhangyusheng on 2018/11/7 15:06
*/
@Mapper
public interface SpecialCardMapper {
public List<SpecialCardEntity> findSpecialCardEntityByAcceptNo(String acceptNo);
public void saveSpecialCardEntity(SpecialCardEntity specialCardEntity);
public void updateSpecialCardEntity(SpecialCardEntity specialCardEntity);
public List<SpecialCardEntity> findSpecialCardEntityByGroupNo(String groupNo);
}
src/main/java/com/yxproject/start/mapper/TaskMapper.java 0 → 100644
View file @ 0806c189
package com.yxproject.start.mapper;
import com.yxproject.start.entity.TaskEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* Created by zhangyusheng on 2018/10/13 9:36
*/
@Mapper
public interface TaskMapper {
public List<TaskEntity> findTaskEntity(long id);
public int insertTaskEntity(TaskEntity taskEntity);
public int updateTaskEntity(TaskEntity taskEntity);
public List<TaskEntity> findTaskEntityByAcceptNo(String acceptNo);
public List<TaskEntity> findTaskEntityByState(int state);
}
src/main/java/com/yxproject/start/mapper/UtilMapper.java
View file @ 0806c189
......@@ -28,4 +28,8 @@ public interface UtilMapper {
* 查询受理号表序列值
*/
public int findAcceptInfoSequenceNextValue();
/**
* 查询派出所证件申请表序列值
*/
public int findPoliceStationApplyReasonSequenceNextValue();
}
src/main/java/com/yxproject/start/service/FailedinfoService.java → src/main/java/com/yxproject/start/service/FailedCardService.java
View file @ 0806c189
package com.yxproject.start.service;
import com.yxproject.start.entity.FailedinfoEntity;
import com.yxproject.start.entity.FailedCardEntity;
import java.util.List;
import java.util.Map;
......@@ -8,8 +8,8 @@ import java.util.Map;
/**
* Created by zhangyusheng on 2018/10/30 10:01
*/
public interface FailedinfoService {
public int saveFailedinfo(List<FailedinfoEntity> failedinfoEntityList);
public int updateFailedinfo(List<FailedinfoEntity> failedinfoEntityList);
public interface FailedCardService {
public int saveFailedinfo(List<FailedCardEntity> failedinfoEntityList);
public int updateFailedinfo(List<FailedCardEntity> failedinfoEntityList);
public List<Map<String,Object>> selectFailedinfo(int state);
}
src/main/java/com/yxproject/start/service/GroupinfoService.java → src/main/java/com/yxproject/start/service/GroupNoService.java
View file @ 0806c189
package com.yxproject.start.service;
import com.yxproject.start.entity.GroupinfoEntity;
import java.util.List;
import java.util.Map;
/**
* Created by zhangyusheng on 2018/11/1 14:22
*/
public interface GroupinfoService {
public List<Map<String, Object>> findCountyInfoList(String cyclesheetID);
public interface GroupNoService {
public List<Map<String, Object>> findCountyInfoList(String taskID);
}
src/main/java/com/yxproject/start/service/PoliceStationApplyReasonService.java 0 → 100644
View file @ 0806c189
package com.yxproject.start.service;
/**
* Created by zhangyusheng on 2018/11/12 14:27
*/
public interface PoliceStationApplyReasonService {
public int savePoliceStationApplyReasonEntity(String cyclesheetID);
}
src/main/java/com/yxproject/start/service/ProductionTaskListService.java → src/main/java/com/yxproject/start/service/TaskService.java
View file @ 0806c189
package com.yxproject.start.service;
import com.yxproject.start.entity.GroupinfoEntity;
import com.yxproject.start.entity.PoliceStationVailedInfoEntity;
import com.yxproject.start.entity.ProductionTaskListEntity;
import com.yxproject.start.entity.*;
import java.util.List;
import java.util.Map;
public interface ProductionTaskListService {
public interface TaskService {
public List<ProductionTaskListEntity> findProductionTaskListEntityByID(String id);
public List<TaskEntity> findProductionTaskListEntityByID(long id);
public int updateProductionTask(ProductionTaskListEntity map);
public int updateProductionTask(TaskEntity map);
public int addProductionTaskListEntity(ProductionTaskListEntity productionTaskListEntity, List<GroupinfoEntity> groupinfoEntities);
public int addProductionTaskListEntity(TaskEntity taskEntity, List<GroupNoEntity> groupNoEntities);
public int addQuickCyclesheetInfo(String acceptNo);
......@@ -22,9 +20,9 @@ public interface ProductionTaskListService {
public List<Object> findAccuProductionInfo(String importDate);
public int savePoliceStationVailedInfoEntity(List<PoliceStationVailedInfoEntity> policeStationVailedInfoEntities);
public int savePoliceStationVailedEntity(List<PoliceStationVailedEntity> policeStationVailedInfoEntities);
public List<PoliceStationVailedInfoEntity> find(String id);
public List<PoliceStationVailedEntity> find(String id);
public List<Map<String,Object>> findProductionTaskListEntityByState(int state);
......
src/main/java/com/yxproject/start/service/impl/FailedinfoServiceImpl.java → src/main/java/com/yxproject/start/service/impl/FailedCardServiceImpl.java
View file @ 0806c189
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.FailedinfoEntity;
import com.yxproject.start.mapper.FailedinfoMapper;
import com.yxproject.start.mapper.UtilMapper;
import com.yxproject.start.service.FailedinfoService;
import com.yxproject.start.entity.FailedCardEntity;
import com.yxproject.start.mapper.FailedCardMapper;
import com.yxproject.start.service.FailedCardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -16,35 +13,29 @@ import java.util.Map;
* Created by zhangyusheng on 2018/10/30 10:02
*/
@Service
public class FailedinfoServiceImpl implements FailedinfoService {
public class FailedCardServiceImpl implements FailedCardService {
@Autowired
private UtilMapper utilMapper;
@Autowired
private FailedinfoMapper failedinfoMapper;
private FailedCardMapper failedCardMapper;
@Override
public int saveFailedinfo(List<FailedinfoEntity> failedinfoEntityList) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
for (FailedinfoEntity failedinfoEntity:failedinfoEntityList){
int failedinfoSequenceNextValue = utilMapper.findFailedinfoSequenceNextValue();
failedinfoEntity.setFailedinfoid(simpleDateFormat.format(new Date())+failedinfoSequenceNextValue);
failedinfoMapper.saveFailedinfoEntity(failedinfoEntity);
public int saveFailedinfo(List<FailedCardEntity> failedinfoEntityList) {
for (FailedCardEntity failedinfoEntity:failedinfoEntityList){
failedCardMapper.saveFailedCardEntity(failedinfoEntity);
}
return 1;
}
@Override
public int updateFailedinfo(List<FailedinfoEntity> failedinfoEntityList) {
for (FailedinfoEntity failedinfoEntity:failedinfoEntityList){
failedinfoMapper.updateFailedinfoEntity(failedinfoEntity);
public int updateFailedinfo(List<FailedCardEntity> failedinfoEntityList) {
for (FailedCardEntity failedinfoEntity:failedinfoEntityList){
failedCardMapper.updateFailedCardEntity(failedinfoEntity);
}
return 1;
}
@Override
public List<Map<String,Object>> selectFailedinfo(int state) {
List<Map<String, Object>> maps = failedinfoMapper.selectFailedinfoByState(state);
List<Map<String, Object>> maps = failedCardMapper.selectFailedCardEntityByState(state);
return maps;
}
}
src/main/java/com/yxproject/start/service/impl/GroupinfoServiceImpl.java → src/main/java/com/yxproject/start/service/impl/GroupNoServiceImpl.java
View file @ 0806c189
package com.yxproject.start.service.impl;
import com.yxproject.start.mapper.GroupinfoMapper;
import com.yxproject.start.service.GroupinfoService;
import com.yxproject.start.mapper.GroupNoMapper;
import com.yxproject.start.service.GroupNoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -13,18 +13,18 @@ import java.util.Map;
* Created by zhangyusheng on 2018/11/1 14:26
*/
@Service
public class GroupinfoServiceImpl implements GroupinfoService {
public class GroupNoServiceImpl implements GroupNoService {
@Autowired
public GroupinfoMapper groupinfoMapper;
public GroupNoMapper groupNoMapper;
@Override
public List<Map<String, Object>> findCountyInfoList(String cyclesheetid) {
int count = groupinfoMapper.findGroupInfoCountByProductionTaskListId(cyclesheetid);
int count = groupNoMapper.findGroupNoCountByTaskId(cyclesheetid);
List<Map<String,Object>> list = new ArrayList<>();
if (count==0){
list = groupinfoMapper.findSpecialCountyList(cyclesheetid);
list = groupNoMapper.findSpecialCountyList(cyclesheetid);
}else{
list = groupinfoMapper.findNormalCountyList(cyclesheetid);
list = groupNoMapper.findNormalCountyList(cyclesheetid);
}
return list;
}
......
src/main/java/com/yxproject/start/service/impl/PoliceStationApplyReasonServiceImpl.java 0 → 100644
View file @ 0806c189
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.PoliceStationApplyReasonEntity;
import com.yxproject.start.mapper.GroupNoMapper;
import com.yxproject.start.mapper.PoliceStationApplyReasonMapper;
import com.yxproject.start.mapper.UtilMapper;
import com.yxproject.start.service.PoliceStationApplyReasonService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* Created by zhangyusheng on 2018/11/12 14:28
*/
@Service
public class PoliceStationApplyReasonServiceImpl implements PoliceStationApplyReasonService {
@Autowired
private PoliceStationApplyReasonMapper policeStationApplyReasonMapper;
@Autowired
private GroupNoMapper groupinfoMapper;
@Autowired
private UtilMapper utilMapper;
@Override
@Transactional(rollbackFor=Exception.class)
public int savePoliceStationApplyReasonEntity(String cyclesheetid) {
int count = groupinfoMapper.findGroupNoCountByTaskId(cyclesheetid);
List<Map<String,Object>> list = new ArrayList<>();
if (count==0){
list = policeStationApplyReasonMapper.findSpecialApplyReasonByCyclesheetID(cyclesheetid);
}else{
list = policeStationApplyReasonMapper.findNormalApplyReasonByCyclesheetID(cyclesheetid);
}
for (Map<String,Object> map :list){
PoliceStationApplyReasonEntity policeStationApplyReasonEntity = new PoliceStationApplyReasonEntity();
policeStationApplyReasonEntity.setTask_Id(Long.valueOf(cyclesheetid));
policeStationApplyReasonEntity.setSave_Date(new Date());
policeStationApplyReasonEntity.setApply_Count(Long.valueOf(map.get("APPLY_COUNT").toString()));
policeStationApplyReasonEntity.setApply_Code(Long.valueOf(map.get("APPLY_CODE").toString()));
policeStationApplyReasonEntity.setPolice_Station_Code(map.get("POLICE_STATION_CODE").toString());
policeStationApplyReasonMapper.savePoliceStationApplyReasonEntity(policeStationApplyReasonEntity);
}
return 1;
}
}
src/main/java/com/yxproject/start/service/impl/ProductionTaskListServiceImpl.java → src/main/java/com/yxproject/start/service/impl/TaskServiceImpl.java
View file @ 0806c189
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.AcceptNoInfoEntity;
import com.yxproject.start.entity.GroupinfoEntity;
import com.yxproject.start.entity.PoliceStationVailedInfoEntity;
import com.yxproject.start.entity.ProductionTaskListEntity;
import com.yxproject.start.entity.*;
import com.yxproject.start.entity.accu.AccCardTEntity;
import com.yxproject.start.entity.prod.ProdCardTEntity;
import com.yxproject.start.mapper.*;
import com.yxproject.start.service.ProductionTaskListService;
import net.sf.json.JSONObject;
import com.yxproject.start.service.TaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -20,13 +16,13 @@ import java.util.*;
* @author Administrator
*/
@Service
public class ProductionTaskListServiceImpl implements ProductionTaskListService {
public class TaskServiceImpl implements TaskService {
@Autowired
public ProductionTaskListMapper productionTaskListMapper;
public TaskMapper taskMapper;
@Autowired
public GroupinfoMapper groupinfoMapper;
public GroupNoMapper groupNoMapper;
@Autowired
public UtilMapper utilMapper;
......@@ -38,10 +34,10 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService
public ProdCardTMapper prodCardTMapper;
@Autowired
public PoliceStationVailedInfoMapper policeStationVailedInfoMapper;
public PoliceStationVailedMapper policeStationVailedMapper;
@Autowired
public AcceptNoInfoMapper acceptNoInfoMapper;
public SpecialCardMapper specialCardMapper;
/**
......@@ -52,74 +48,70 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService
* @return
*/
@Override
public List<ProductionTaskListEntity> findProductionTaskListEntityByID(String id) {
return productionTaskListMapper.findProductionTaskListEntity(id);
public List<TaskEntity> findProductionTaskListEntityByID(long id) {
return taskMapper.findTaskEntity(id);
}
/**
* 更新任务单信息
* 通过新的任务单信息
*
* @param productionTaskListEntity
* @param taskEntity
* @return
*/
@Override
public int updateProductionTask(ProductionTaskListEntity productionTaskListEntity) {
public int updateProductionTask(TaskEntity taskEntity) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
//todo 状态更新时间
Long state = productionTaskListEntity.getState();
Long state = taskEntity.getTask_State_Id();
switch (Integer.valueOf(state.toString())) {
case 1:
productionTaskListEntity.setHandout_Date(simpleDateFormat.format(new Date()));
taskEntity.setIssued_Date(new Date());
break;
case 2:
productionTaskListEntity.setDownload_Date(simpleDateFormat.format(new Date()));
taskEntity.setDownload_Date(new Date());
break;
case 3:
productionTaskListEntity.setPrint_Out(simpleDateFormat.format(new Date()));
productionTaskListEntity.setIs_Print((long)3);
taskEntity.setPrint_Out_Date(new Date());
taskEntity.setPrint_State((long)3);
break;
case 4:
productionTaskListEntity.setPermanent_Position_Date(simpleDateFormat.format(new Date()));
taskEntity.setPosition_Date(new Date());
break;
case 5:
productionTaskListEntity.setRoll_Out_Workshop_Date(simpleDateFormat.format(new Date()));
taskEntity.setOut_Workshop_Date(new Date());
break;
case 6:
productionTaskListEntity.setQualityinspection_Date(simpleDateFormat.format(new Date()));
taskEntity.setQuality_Test_Date(new Date());
break;
case 7:
productionTaskListEntity.setPutinstorage_Date(simpleDateFormat.format(new Date()));
taskEntity.setIn_Storage_Date(new Date());
break;
case 8:
productionTaskListEntity.setOutbound_Date(simpleDateFormat.format(new Date()));
taskEntity.setOut_Storage_Date(new Date());
break;
default:
break;
}
return productionTaskListMapper.updateProductionTask(productionTaskListEntity);
return taskMapper.updateTaskEntity(taskEntity);
}
/**
* 生成任务单并保存组号列表
*
* @param productionTaskListEntity 任务单详情
* @param groupinfoEntities 组号列表
* @param taskEntity 任务单详情
* @param groupNoEntities 组号列表
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int addProductionTaskListEntity(ProductionTaskListEntity productionTaskListEntity, List<GroupinfoEntity> groupinfoEntities) {
public int addProductionTaskListEntity(TaskEntity taskEntity, List<GroupNoEntity> groupNoEntities) {
int production_task_list_seq = utilMapper.findProductionTaskListSequenceNextValue();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
productionTaskListEntity.setProduction_Task_List_Id(simpleDateFormat.format(new Date()) + production_task_list_seq);
productionTaskListMapper.insertProductionTaskListEntity(productionTaskListEntity);
for (GroupinfoEntity groupinfoEntity : groupinfoEntities) {
int groupInfoSequenceValue = utilMapper.findGroupInfoSequenceNextValue();
groupinfoEntity.setGroupid(simpleDateFormat.format(new Date()) + groupInfoSequenceValue);
groupinfoEntity.setCyclesheetid(simpleDateFormat.format(new Date()) + production_task_list_seq);
groupinfoMapper.insertGroupinfoEntity(groupinfoEntity);
taskMapper.insertTaskEntity(taskEntity);
for (GroupNoEntity groupNoEntity : groupNoEntities) {
groupNoMapper.insertGroupNoEntity(groupNoEntity);
}
return 1;
......@@ -150,7 +142,7 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService
accept_no = prodCardTEntity.getAccept_No();
}
}
List<ProductionTaskListEntity> productionTaskListEntityByAcceptNo = productionTaskListMapper.findProductionTaskListEntityByAcceptNo(accept_no);
List<TaskEntity> productionTaskListEntityByAcceptNo = taskMapper.findTaskEntityByAcceptNo(accept_no);
list.addAll(productionTaskListEntityByAcceptNo);
return list;
}
......@@ -182,13 +174,13 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService
accept_no = prodCardTEntity.getAccept_No();
}
}
List<GroupinfoEntity> groupinfoEntityByAcceptNo = groupinfoMapper.findGroupinfoEntityByAcceptNo(accept_no);
List<AcceptNoInfoEntity> acceptNoInfoEntityList = acceptNoInfoMapper.findAcceptNoInfoEntityByAcceptNo(accept_no);
List<GroupNoEntity> groupNoEntityByAcceptNo = groupNoMapper.findGroupNoEntityByAcceptNo(accept_no);
List<SpecialCardEntity> specialCardEntities = specialCardMapper.findSpecialCardEntityByAcceptNo(accept_no);
/**
* 没有下发任务单的情况
* 即 在组号列表中没有没有该受理组号
*/
if (groupinfoEntityByAcceptNo.size() == 0) {
if (groupNoEntityByAcceptNo.size() == 0) {
List<Map<String, Object>> entity = accCardTMapper.findAccGroupTEntityByCardIdOrAcceptNo(accept_no);
for (Map<String, Object> map : entity) {
Object group_no = map.get("GROUP_NO");
......@@ -198,40 +190,38 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService
/**
* 生成原来的任务单 但不下发
*/
ProductionTaskListEntity productionTaskListEntity = new ProductionTaskListEntity();
TaskEntity taskEntity = new TaskEntity();
int production_task_list_seq = utilMapper.findProductionTaskListSequenceNextValue();
productionTaskListEntity.setProduction_Task_List_Id(simpleDateFormat.format(new Date()) + production_task_list_seq);
productionTaskListEntity.setCitycode(original_no.toString().substring(0, 6));
productionTaskListEntity.setMake_Type(Long.valueOf(original_no.toString().substring(20, 21)));
productionTaskListEntity.setSubmit_Date(simpleDateFormat.format(new Date()));
productionTaskListMapper.insertProductionTaskListEntity(productionTaskListEntity);
taskEntity.setCitycode(original_no.toString().substring(0, 6));
taskEntity.setCard_Type(Long.valueOf(original_no.toString().substring(20, 21)));
taskEntity.setSubmit_Date(new Date());
taskMapper.insertTaskEntity(taskEntity);
/**
* 生成原来任务单的组号列表
* 原组号
*/
int groupInfoSequenceValue = utilMapper.findGroupInfoSequenceNextValue();
GroupinfoEntity groupinfoEntity = new GroupinfoEntity();
groupinfoEntity.setGroupid(simpleDateFormat.format(new Date()) + groupInfoSequenceValue);
groupinfoEntity.setCyclesheetid(simpleDateFormat.format(new Date()) + production_task_list_seq);
groupinfoEntity.setGroupno(group_no.toString());
groupinfoEntity.setInvalid_Count(Long.valueOf(invalid_count.toString()));
groupinfoEntity.setValid_Count(Long.valueOf(valid_count.toString()));
groupinfoEntity.setSpecial_Card_Count((long) 1);
groupinfoMapper.insertGroupinfoEntity(groupinfoEntity);
GroupNoEntity groupNoEntity = new GroupNoEntity();
groupNoEntity.setTask_Id(taskEntity.getTask_Id());
GroupNoEntity groupNoEntity1 = new GroupNoEntity();
groupNoEntity1.setTask_Id(taskEntity.getTask_Id());
groupNoEntity1.setGroup_No(group_no.toString());
groupNoEntity1.setInvalid_Count(Long.valueOf(invalid_count.toString()));
groupNoEntity1.setVaild_Count(Long.valueOf(valid_count.toString()));
groupNoEntity1.setSpecial_Card_Count((long) 1);
groupNoMapper.insertGroupNoEntity(groupNoEntity1);
/**
* 生成快证任务单并下发
*/
ProductionTaskListEntity productionTaskListEntityQ = new ProductionTaskListEntity();
int production_task_list_seqQ = utilMapper.findProductionTaskListSequenceNextValue();
productionTaskListEntityQ.setProduction_Task_List_Id(simpleDateFormat.format(new Date()) + production_task_list_seqQ);
productionTaskListEntityQ.setCitycode(original_no.toString().substring(0, 6));
productionTaskListEntityQ.setMake_Type((long) 1);
productionTaskListEntityQ.setOld_Make_Type(Long.valueOf(original_no.toString().substring(20, 21)));
productionTaskListEntityQ.setSubmit_Date(simpleDateFormat.format(new Date()));
productionTaskListEntityQ.setHandout_Date(simpleDateFormat.format(new Date()));
productionTaskListMapper.insertProductionTaskListEntity(productionTaskListEntityQ);
TaskEntity taskEntity1 = new TaskEntity();
taskEntity1.setCitycode(original_no.toString().substring(0, 6));
taskEntity1.setCard_Type((long) 1);
taskEntity1.setOld_Card_Type(Long.valueOf(original_no.toString().substring(20, 21)));
taskEntity1.setSubmit_Date(new Date());
taskEntity1.setIssued_Date(new Date());
taskMapper.insertTaskEntity(taskEntity1);
// /**
// * 生成快证任务单的组号列表
// * 快证组号
......@@ -248,21 +238,20 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService
* 生成快证任务单的受理号信息
*/
int acceptInfoSequenceNextValue = utilMapper.findAcceptInfoSequenceNextValue();
AcceptNoInfoEntity acceptNoInfoEntity = new AcceptNoInfoEntity();
acceptNoInfoEntity.setAccept_No_Info_Id(simpleDateFormat.format(new Date()) + acceptInfoSequenceNextValue);
acceptNoInfoEntity.setAccept_No(accept_no);
SpecialCardEntity specialCardEntity = new SpecialCardEntity();
specialCardEntity.setAccept_No(accept_no);
//设置受理类型为快证
acceptNoInfoEntity.setAccept_Type((long) 1);
acceptNoInfoEntity.setCyclesheetid(simpleDateFormat.format(new Date()) + production_task_list_seq);
acceptNoInfoEntity.setGroup_No(accept_no.substring(0, 8));
acceptNoInfoMapper.saveAcceptNoInfoEntity(acceptNoInfoEntity);
specialCardEntity.setSpecial_Type((long) 1);
specialCardEntity.setTask_Id(taskEntity1.getTask_Id());
specialCardEntity.setGroup_No(accept_no.substring(0, 8));
specialCardMapper.saveSpecialCardEntity(specialCardEntity);
}
} else if (groupinfoEntityByAcceptNo.size() == 1 && acceptNoInfoEntityList.size() == 0) {
} else if (groupNoEntityByAcceptNo.size() == 1 && specialCardEntities.size() == 0) {
/**
* 下发任务单 但没有产生余证的情况
* 即 只有一个受理组号
*/
List<ProductionTaskListEntity> productionTaskListEntity = productionTaskListMapper.findProductionTaskListEntity(groupinfoEntityByAcceptNo.get(0).getCyclesheetid());
List<TaskEntity> taskEntities = taskMapper.findTaskEntity(groupNoEntityByAcceptNo.get(0).getTask_Id());
// /**
// * 从原来的任务单中减去快证
// * 即从原来任务单组号列表中插入一条-1的组号
......@@ -278,21 +267,19 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService
/**
* 更新组号信息表中的特殊证数量
*/
GroupinfoEntity groupinfoEntity = groupinfoEntityByAcceptNo.get(1);
groupinfoEntity.setSpecial_Card_Count(groupinfoEntity.getSpecial_Card_Count() + 1);
groupinfoMapper.updateGroupinfoEntity(groupinfoEntity);
GroupNoEntity groupNoEntity = groupNoEntityByAcceptNo.get(1);
groupNoEntity.setSpecial_Card_Count(groupNoEntity.getSpecial_Card_Count() + 1);
groupNoMapper.updateGroupinfoEntity(groupNoEntity);
/**
* 生成快证任务单并下发
*/
ProductionTaskListEntity productionTaskListEntityQ = new ProductionTaskListEntity();
int production_task_list_seqQ = utilMapper.findProductionTaskListSequenceNextValue();
productionTaskListEntityQ.setProduction_Task_List_Id(simpleDateFormat.format(new Date()) + production_task_list_seqQ);
productionTaskListEntityQ.setCitycode(productionTaskListEntity.get(0).getCitycode());
productionTaskListEntityQ.setMake_Type((long) 1);
productionTaskListEntityQ.setOld_Make_Type(productionTaskListEntity.get(0).getMake_Type());
productionTaskListEntityQ.setSubmit_Date(simpleDateFormat.format(new Date()));
productionTaskListEntityQ.setHandout_Date(simpleDateFormat.format(new Date()));
productionTaskListMapper.insertProductionTaskListEntity(productionTaskListEntityQ);
TaskEntity taskEntity = new TaskEntity();
taskEntity.setCitycode(taskEntities.get(0).getCitycode());
taskEntity.setCard_Type((long) 1);
taskEntity.setOld_Card_Type(taskEntities.get(0).getCard_Type());
taskEntity.setSubmit_Date(new Date());
taskEntity.setIssued_Date(new Date());
taskMapper.insertTaskEntity(taskEntity);
// /**
// * 生成快证任务单的组号列表
// * 快证组号
......@@ -310,14 +297,13 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService
* 生成快证任务单的受理号信息
*/
int acceptInfoSequenceNextValue = utilMapper.findAcceptInfoSequenceNextValue();
AcceptNoInfoEntity acceptNoInfoEntity = new AcceptNoInfoEntity();
acceptNoInfoEntity.setAccept_No_Info_Id(simpleDateFormat.format(new Date()) + acceptInfoSequenceNextValue);
acceptNoInfoEntity.setAccept_No(accept_no);
SpecialCardEntity specialCardEntity = new SpecialCardEntity();
specialCardEntity.setAccept_No(accept_no);
//设置受理类型为快证
acceptNoInfoEntity.setAccept_Type((long) 1);
acceptNoInfoEntity.setCyclesheetid(simpleDateFormat.format(new Date()) + production_task_list_seqQ);
acceptNoInfoEntity.setGroup_No(accept_no.substring(0, 8));
acceptNoInfoMapper.saveAcceptNoInfoEntity(acceptNoInfoEntity);
specialCardEntity.setSpecial_Type((long) 1);
specialCardEntity.setTask_Id(taskEntity.getTask_Id());
specialCardEntity.setGroup_No(accept_no.substring(0, 8));
specialCardMapper.saveSpecialCardEntity(specialCardEntity);
} else {
// /**
// * 下发任务单 存在产生余证的情况
......@@ -350,15 +336,15 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService
* 下发任务单 存在产生余证的情况
* 更新余证任务单的制证类型以及更新受理号信息的受理类型
*/
List<ProductionTaskListEntity> productionTaskListEntities = productionTaskListMapper.findProductionTaskListEntity(groupinfoEntityByAcceptNo.get(0).getCyclesheetid());
for (ProductionTaskListEntity productionTaskListEntity : productionTaskListEntities) {
productionTaskListEntity.setOld_Make_Type(productionTaskListEntity.getMake_Type());
productionTaskListEntity.setMake_Type((long) 1);
productionTaskListMapper.updateProductionTask(productionTaskListEntity);
List<TaskEntity> productionTaskListEntities = taskMapper.findTaskEntity(groupNoEntityByAcceptNo.get(0).getTask_Id());
for (TaskEntity productionTaskListEntity : productionTaskListEntities) {
productionTaskListEntity.setOld_Card_Type(productionTaskListEntity.getCard_Type());
productionTaskListEntity.setCard_Type((long) 1);
taskMapper.updateTaskEntity(productionTaskListEntity);
}
for (AcceptNoInfoEntity acceptNoInfoEntity : acceptNoInfoEntityList) {
acceptNoInfoEntity.setAccept_Type((long) 1);
acceptNoInfoMapper.updateAcceptNoInfoEntity(acceptNoInfoEntity);
for (SpecialCardEntity specialCardEntity : specialCardEntities) {
specialCardEntity.setSpecial_Type((long) 1);
specialCardMapper.updateSpecialCardEntity(specialCardEntity);
}
}
return 1;
......@@ -380,17 +366,15 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService
/**
* 保持派出所照片质量详情
*
* @param policeStationVailedInfoEntities
* @param policeStationVailedInfoEntityList
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int savePoliceStationVailedInfoEntity(List<PoliceStationVailedInfoEntity> policeStationVailedInfoEntities) {
public int savePoliceStationVailedEntity(List<PoliceStationVailedEntity> policeStationVailedInfoEntityList) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
for (PoliceStationVailedInfoEntity policeEntity : policeStationVailedInfoEntities) {
int policeStationVailedSequenceNextValue = utilMapper.findPoliceStationVailedSequenceNextValue();
policeEntity.setPolice_Station_Vailed_Info_Id(simpleDateFormat.format(new Date()) + policeStationVailedSequenceNextValue);
policeStationVailedInfoMapper.savePoliceStationVailedInfoEntity(policeEntity);
for (PoliceStationVailedEntity policeEntity : policeStationVailedInfoEntityList) {
policeStationVailedMapper.savePoliceStationVailedInfoEntity(policeEntity);
}
return 1;
}
......@@ -404,19 +388,19 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService
*/
@Override
public List<Map<String, Object>> findProductionTaskListEntityByState(int state) {
List<ProductionTaskListEntity> productionTaskListEntities = productionTaskListMapper.findProductionTaskListEntityByState(state);
List<TaskEntity> productionTaskListEntities = taskMapper.findTaskEntityByState(state);
List<Map<String, Object>> productionTaskMapList = new ArrayList<>();
for (ProductionTaskListEntity productionTaskListEntity : productionTaskListEntities) {
for (TaskEntity taskEntity : productionTaskListEntities) {
Map<String, Object> map = new HashMap<>();
map.put("productionTaskListEntity", productionTaskListEntity);
map.put("productionTaskListEntity", taskEntity);
List<Map<String, Object>> groupinfoMapList = new ArrayList<>();
List<GroupinfoEntity> groupinfoEntityList = groupinfoMapper.findGroupinfoEntityListByProductionTaskListId(productionTaskListEntity.getProduction_Task_List_Id());
List<GroupNoEntity> groupNoEntityListByTaskId = groupNoMapper.findGroupNoEntityListByTaskId(taskEntity.getTask_Id());
for (GroupinfoEntity groupinfoEntity : groupinfoEntityList) {
for (GroupNoEntity groupNoEntity : groupNoEntityListByTaskId) {
Map<String, Object> groupinfoMap = new HashMap<>();
groupinfoMap.put("groupinfoEntity", groupinfoEntity);
List<AcceptNoInfoEntity> acceptNoInfoEntity = acceptNoInfoMapper.findAcceptNoInfoEntityByGroupNo(groupinfoEntity.getGroupno());
groupinfoMap.put("acceptNoInfoEntity", acceptNoInfoEntity);
groupinfoMap.put("groupinfoEntity", groupNoEntity);
List<SpecialCardEntity> specialCardEntities = specialCardMapper.findSpecialCardEntityByGroupNo(groupNoEntity.getGroup_No());
groupinfoMap.put("acceptNoInfoEntity", specialCardEntities);
groupinfoMapList.add(groupinfoMap);
}
map.put("groupinfoMapList", groupinfoMapList);
......@@ -434,8 +418,8 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService
* @return
*/
@Override
public List<PoliceStationVailedInfoEntity> find(String id) {
List<PoliceStationVailedInfoEntity> policeStationVailedInfoEntityByID = policeStationVailedInfoMapper.findPoliceStationVailedInfoEntityByID(id);
public List<PoliceStationVailedEntity> find(String id) {
List<PoliceStationVailedEntity> policeStationVailedInfoEntityByID = policeStationVailedMapper.findPoliceStationVailedEntity(id);
return policeStationVailedInfoEntityByID;
}
}
src/main/resources/mapper/AcceptNoInfoMapper.xml deleted 100644 → 0
View file @ f08b7894
<?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" >
<mapper namespace="com.yxproject.start.mapper.AcceptNoInfoMapper">
<resultMap id="AcceptNoInfoMapper" type="com.yxproject.start.entity.AcceptNoInfoEntity">
<id column="ACCEPT_NO_INFO_ID" property="accept_No_Info_Id" jdbcType="VARCHAR"/>
<result column="ACCEPT_NO" property="accept_No" jdbcType="VARCHAR"/>
<result column="CYCLESHEETID" property="cyclesheetid" jdbcType="VARCHAR"/>
<result column="GROUP_NO" property="group_No" jdbcType="VARCHAR"/>
<result column="ACCEPT_TYPE" property="accept_Type" jdbcType="NUMERIC"/>
</resultMap>
<select id="findAcceptNoInfoEntityByAcceptNo" resultType="com.yxproject.start.entity.AcceptNoInfoEntity" parameterType="String">
select * from ACCEPT_NO_INFO where ACCEPT_NO =#{accept_No}
</select>
<insert id="saveAcceptNoInfoEntity" parameterType="com.yxproject.start.entity.AcceptNoInfoEntity">
INSERT INTO ACCEPT_NO_INFO (ACCEPT_NO_INFO_ID, ACCEPT_NO, CYCLESHEETID, ACCEPT_TYPE,GROUP_NO) VALUES (#{accept_No_Info_Id}, #{accept_No}, #{cyclesheetid}, #{accept_Type},#{group_No})
</insert>
<update id="updateAcceptNoInfoEntity" parameterType="com.yxproject.start.entity.AcceptNoInfoEntity">
update ACCEPT_NO_INFO
<set>
<if test="accept_No" >accept_No=#{accept_No} </if>
<if test="cyclesheetid" >cyclesheetid=#{cyclesheetid} </if>
<if test="group_No" >group_No=#{group_No} </if>
<if test="accept_Type" >accept_Type=#{accept_Type} </if>
</set>
where accept_No_Info_Id =#{accept_No_Info_Id}
</update>
<select id="findAcceptNoInfoEntityByGroupNo" resultType="com.yxproject.start.entity.AcceptNoInfoEntity" parameterType="String">
select * from ACCEPT_NO_INFO where GROUP_NO =#{group_No}
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/FailedinfoMapper.xml → src/main/resources/mapper/FailedCardMapper.xml
View file @ 0806c189
<?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" >
<mapper namespace="com.yxproject.start.mapper.FailedinfoMapper">
<resultMap id="FailedinfoMapper" type="com.yxproject.start.entity.FailedinfoEntity">
<id column="FAILEDINFOID" property="failedinfoid" jdbcType="VARCHAR"/>
<result column="FAILED_REASON" property="failed_Reason" jdbcType="NUMERIC"/>
<result column="GROUPNO" property="groupno" jdbcType="VARCHAR"/>
<result column="CYCLESHEETID" property="cyclesheetid" jdbcType="VARCHAR"/>
<result column="POSITION_DATE" property="position_Date" jdbcType="VARCHAR"/>
<result column="FINISH_DATE" property="finish_Date" jdbcType="VARCHAR"/>
<result column="ALLOT_DATE" property="allot_Date" jdbcType="VARCHAR"/>
<result column="PRINT_DATE" property="print_Date" jdbcType="VARCHAR"/>
<mapper namespace="com.yxproject.start.mapper.FailedCardMapper">
<resultMap id="FailedCardMapper" type="com.yxproject.start.entity.FailedCardEntity">
<id column="FAILED_CARD_ID" property="failed_Card_Id" jdbcType="NUMERIC"/>
<result column="FAILED_CARD_REASON_ID" property="failed_Card_Reason_Id" jdbcType="NUMERIC"/>
<result column="ACCEPT_NO" property="accept_No" jdbcType="VARCHAR"/>
<result column="TASK_ID" property="task_Id" jdbcType="NUMERIC"/>
<result column="POSITION_DATE" property="position_Date" jdbcType="DATE"/>
<result column="FINISH_DATE" property="finish_Date" jdbcType="DATE"/>
<result column="ALLOT_DATE" property="allot_Date" jdbcType="DATE"/>
<result column="PRINT_DATE" property="print_Date" jdbcType="DATE"/>
<result column="STATE" property="state" jdbcType="NUMERIC"/>
</resultMap>
<select id="selectFailedinfoByState" resultType="java.util.HashMap" parameterType="java.lang.Integer">
select * from failedinfo where state = #{state}
<select id="selectFailedCardEntityByState" resultType="java.util.HashMap" parameterType="java.lang.Integer">
select * from FAILED_CARD where state = #{state}
</select>
<insert id="saveFailedinfoEntity" parameterType="com.yxproject.start.entity.FailedinfoEntity" >
insert into FAILEDINFO (FAILEDINFOID,FAILED_REASON,GROUPNO,CYCLESHEETID,POSITION_DATE,FINISH_DATE,ALLOT_DATE,PRINT_DATE,STATE )
values (#{failedinfoid},#{failed_Reason},#{groupno},#{cyclesheetid},#{position_Date},#{finish_Date},#{allot_Date},#{print_Date},#{state})
<insert id="saveFailedCardEntity" parameterType="com.yxproject.start.entity.FailedCardEntity" >
insert into FAILED_CARD (FAILED_CARD_ID,FAILED_CARD_REASON_ID,ACCEPT_NO,TASK_ID,POSITION_DATE,FINISH_DATE,ALLOT_DATE,PRINT_DATE,STATE )
values (#{failed_Card_Id},#{failed_Card_Reason_Id},#{accept_No},#{task_Id},#{position_Date},#{finish_Date},#{allot_Date},#{print_Date},#{state})
</insert>
<update id="updateFailedinfoEntity" parameterType="com.yxproject.start.entity.FailedinfoEntity">
update FAILEDINFO
<update id="updateFailedCardEntity" parameterType="com.yxproject.start.entity.FailedCardEntity">
update FAILED_CARD
<set>
<if test="failed_Reason" >FAILED_REASON=#{failed_Reason} </if>
<if test="groupno" >GROUPNO=#{groupno} </if>
<if test="cyclesheetid" >cyclesheetid=#{cyclesheetid} </if>
<if test="failed_Card_Reason_Id" >FAILED_CARD_REASON_ID=#{failed_Card_Reason_Id} </if>
<if test="accept_No" >accept_No=#{accept_No} </if>
<if test="task_Id" >task_Id=#{task_Id} </if>
<if test="position_Date" >position_Date=#{position_Date} </if>
<if test="finish_Date" >finish_Date=#{finish_Date} </if>
<if test="allot_Date" >allot_Date=#{allot_Date} </if>
<if test="print_Date" >print_Date=#{print_Date} </if>
<if test="state" >state=#{state} </if>
</set>
where failedinfoid =#{failedinfoid}
where failed_Card_Id =#{failed_Card_Id}
</update>
</mapper>
\ No newline at end of file
src/main/resources/mapper/GroupinfoMapper.xml → src/main/resources/mapper/GroupNoMapper.xml
View file @ 0806c189
<?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" >
<mapper namespace="com.yxproject.start.mapper.GroupinfoMapper">
<resultMap id="GroupinfoMapper" type="com.yxproject.start.entity.GroupinfoEntity">
<id column="GROUPID" property="groupid" jdbcType="VARCHAR"/>
<result column="GROUPNO" property="groupno" jdbcType="VARCHAR"/>
<result column="CYCLESHEETID" property="cyclesheetid" jdbcType="VARCHAR"/>
<mapper namespace="com.yxproject.start.mapper.GroupNoMapper">
<resultMap id="GroupNoMapper" type="com.yxproject.start.entity.GroupNoEntity">
<id column="GROUP_ID" property="group_Id" jdbcType="NUMERIC"/>
<result column="TASK_ID" property="task_Id" jdbcType="NUMERIC"/>
<result column="GROUP_NO" property="group_No" jdbcType="VARCHAR"/>
<result column="VAILD_COUNT" property="vaild_Count" jdbcType="NUMERIC"/>
<result column="INVALID_COUNT" property="invalid_Count" jdbcType="NUMERIC"/>
<result column="SPECIAL_CARD_COUNT" property="special_Card_Count" jdbcType="NUMERIC"/>
</resultMap>
<select id="findGroupinfoEntityListByProductionTaskListId" resultType="com.yxproject.start.entity.GroupinfoEntity" parameterType="String">
select * from GROUPINFO where cyclesheetid like #{cyclesheetid}
<select id="findGroupNoEntityListByTaskId" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
select * from GROUP_NO where task_Id like #{task_Id}
</select>
<insert id="insertGroupinfoEntity" parameterType="com.yxproject.start.entity.GroupinfoEntity">
Insert into GROUPINFO (GROUPID,GROUPNO,CYCLESHEETID,VAILD_COUNT,INVALID_COUNT,special_Card_Count) values
(#{groupid},#{groupno},#{grouptype},#{cyclesheetid},#{vaildCount},#{invalidCount},#{special_Card_Count})
<insert id="insertGroupNoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity">
Insert into GROUP_NO (GROUP_ID,GROUP_NO,task_Id,VAILD_COUNT,INVALID_COUNT,special_Card_Count) values
(#{group_Id},#{group_No},#{task_Id},#{vaild_Count},#{invalid_Count},#{special_Card_Count})
</insert>
<select id="findGroupinfoEntityByAcceptNo" resultType="com.yxproject.start.entity.GroupinfoEntity" parameterType="String">
select * from GROUPINFO where GROUPNO =substr(#{acceptNo},0,8)
<select id="findGroupNoEntityByAcceptNo" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
select * from GROUP_NO where GROUP_NO =substr(#{acceptNo},0,8)
</select>
<update id="updateGroupinfoEntity" parameterType="com.yxproject.start.entity.GroupinfoEntity">
update GROUPINFO set GROUPID=#{groupid}
<if test="groupno">,groupno =#{groupno}</if>
<if test="cyclesheetid">,cyclesheetid =#{cyclesheetid}</if>
<if test="grouptype">,grouptype =#{grouptype}</if>
<if test="valid_Count">,valid_Count =#{valid_Count}</if>
<update id="updateGroupinfoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity">
update GROUP_NO set GROUP_ID=#{group_Id}
<if test="group_No">,group_No =#{group_No}</if>
<if test="task_Id">,task_Id =#{task_Id}</if>
<if test="vaild_Count">,vaild_Count =#{vaild_Count}</if>
<if test="invalid_Count">,invalid_Count =#{invalid_Count}</if>
<if test="special_Card_Count">,special_Card_Count =#{special_Card_Count}</if>
where GROUPID=#{groupid}
where GROUP_ID=#{group_Id}
</update>
<select id="findGroupInfoCountByProductionTaskListId" parameterType="String" resultType="int">
select count(GROUPNO) from GROUPINFO where CYCLESHEETID =#{cyclesheetid}
<select id="findGroupNoCountByTaskId" parameterType="String" resultType="int">
select count(GROUP_NO) from GROUP_NO where task_Id =#{task_Id}
</select>
<select id="findSpecialCountyList" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM TABLE(FIND_SPECIAL_COUNTY_LIST.GET_county_infos(#{cyclesheetid}))
SELECT * FROM TABLE(FIND_SPECIAL_COUNTY_LIST.GET_county_infos(#{task_Id}))
</select>
<select id="findNormalCountyList" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM TABLE(find_normal_county_list.GET_county_infos(#{cyclesheetid}))
SELECT * FROM TABLE(find_normal_county_list.GET_county_infos(#{task_Id}))
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/PoliceStationApplyReasonMapper.xml 0 → 100644
View file @ 0806c189
<?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" >
<mapper namespace="com.yxproject.start.mapper.PoliceStationApplyReasonMapper">
<resultMap id="PoliceStationApplyReasonMapper" type="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
<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="CYCLESHEETID" property="cyclesheetid" 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_COUNT" property="apply_Count" jdbcType="NUMERIC"/>
</resultMap>
<insert id="savePoliceStationApplyReasonEntity" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
Insert into POLICE_STATION_APPLY_REASON (POLICE_STATION_APPLY_REASON_ID,APPLY_REASON_SAVEDATE,CYCLESHEETID,POLICE_STATION_CODE,APPLY_REASON_CODE,APPLY_COUNT)
values (#{police_Station_Apply_Reason_Id},#{apply_Reason_Savedate},#{cyclesheetid},#{police_Station_Code},#{apply_Reason_Code},#{apply_Count})
</insert>
<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}
<if test="apply_Reason_Savedate">,APPLY_REASON_SAVEDATE =#{apply_Reason_Savedate}</if>
<if test="cyclesheetid">,cyclesheetid =#{cyclesheetid}</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_Count">,apply_Count =#{apply_Count}</if>
where POLICE_STATION_APPLY_REASON_ID=#{police_Station_Apply_Reason_Id}
</update>
<select id="findNormalApplyReasonByCyclesheetID" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM TABLE(find_normal_apply_reason_list.get_apply_reason_list(#{cyclesheetid}))
</select>
<select id="findSpecialApplyReasonByCyclesheetID" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM TABLE(find_special_apply_reason_list.get_apply_reason_list(#{cyclesheetid}))
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/ProductionTaskListMapper.xml deleted 100644 → 0
View file @ f08b7894
<?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" >
<mapper namespace="com.yxproject.start.mapper.ProductionTaskListMapper">
<resultMap id="ProductionTaskListMap" type="com.yxproject.start.entity.ProductionTaskListEntity">
<id column="PRODUCTION_TASK_LIST_ID" property="production_Task_List_Id" jdbcType="VARCHAR"/>
<result column="MAKE_TYPE" property="make_Type" jdbcType="NUMERIC"/>
<result column="OLD_MAKE_TYPE" property="old_Make_Type" jdbcType="NUMERIC"/>
<result column="CITYCODE" property="citycode" jdbcType="VARCHAR"/>
<result column="WORKSHOP" property="workshop" jdbcType="VARCHAR"/>
<result column="SUBMIT_DATE" property="submit_Date" jdbcType="VARCHAR"/>
<result column="HANDOUT_DATE" property="handout_Date" jdbcType="VARCHAR"/>
<result column="IS_PRINT" property="is_Print" jdbcType="NUMERIC"/>
<result column="DOWNLOAD_DATE" property="download_Date" jdbcType="VARCHAR"/>
<result column="PRINT_OUT" property="print_Out" jdbcType="VARCHAR"/>
<result column="PERMANENT_POSITION_DATE" property="permanent_Position_Date" jdbcType="VARCHAR"/>
<result column="ROLL_OUT_WORKSHOP_DATE" property="roll_Out_Workshop_Date" jdbcType="VARCHAR"/>
<result column="QUALITYINSPECTION_NAME" property="qualityinspection_Name" jdbcType="VARCHAR"/>
<result column="QUALITYINSPECTION_DATE" property="qualityinspection_Date" jdbcType="VARCHAR"/>
<result column="EXCEPTION_INFORMATION" property="exception_Information" jdbcType="VARCHAR"/>
<result column="OUTBOUND_DATE" property="outbound_Date" jdbcType="VARCHAR"/>
<result column="PUTINSTORAGE_DATE" property="putinstorage_Date" jdbcType="VARCHAR"/>
<result column="STATE" property="state" jdbcType="NUMERIC"/>
</resultMap>
<select id="findProductionTaskListEntity" resultType="com.yxproject.start.entity.ProductionTaskListEntity" parameterType="String">
select * from PRODUCTION_TASK_LIST where PRODUCTION_TASK_LIST_ID like #{id}
</select>
<insert id="insertProductionTaskListEntity" parameterType="com.yxproject.start.entity.ProductionTaskListEntity">
Insert into PRODUCTION_TASK_LIST (PRODUCTION_TASK_LIST_ID,MAKE_TYPE,OLD_MAKE_TYPE,CITYCODE,WORKSHOP,SUBMIT_DATE,HANDOUT_DATE,IS_PRINT,DOWNLOAD_DATE,PRINT_OUT,PERMANENT_POSITION_DATE,ROLL_OUT_WORKSHOP_DATE,QUALITYINSPECTION_NAME,QUALITYINSPECTION_DATE,EXCEPTION_INFORMATION,OUTBOUND_DATE,PUTINSTORAGE_DATE,STATE)
values (#{production_Task_List_Id},#{make_Type},#{old_Make_Type},#{citycode},#{workshop},#{submit_Date},#{handout_Date},#{is_Print},#{download_Date},#{print_Out},#{permanent_Position_Date},#{roll_Out_Workshop_Date},#{qualityinspection_Name},#{qualityinspection_Date},#{exception_Information},#{outbound_Date},#{putinstorage_Date},#{state})
</insert>
<update id="updateProductionTask" parameterType="com.yxproject.start.entity.ProductionTaskListEntity">
update PRODUCTION_TASK_LIST
<set>
<if test="old_Make_Type ">OLD_MAKE_TYPE =#{old_Make_Type},</if>
<if test="make_Type ">MAKE_TYPE =#{make_Type},</if>
<if test="citycode ">CITYCODE =#{citycode},</if>
<if test="workshop">WORKSHOP =#{workshop},</if>
<if test="submit_Date ">SUBMIT_DATE =#{submit_Date},</if>
<if test="handout_Date ">HANDOUT_DATE =#{handout_Date},</if>
<if test="is_Print">IS_PRINT =#{is_Print},</if>
<if test="download_Date">DOWNLOAD_DATE =#{download_Date},</if>
<if test="print_Out">PRINT_OUT =#{print_Out},</if>
<if test="permanent_Position_Date">PERMANENT_POSITION_DATE =#{permanent_Position_Date},</if>
<if test="roll_Out_Workshop_Date ">ROLL_OUT_WORKSHOP_DATE =#{roll_Out_Workshop_Date},</if>
<if test="qualityinspection_Name">QUALITYINSPECTION_NAME =#{qualityinspection_Name},</if>
<if test="qualityinspection_Date">QUALITYINSPECTION_DATE =#{qualityinspection_Date},</if>
<if test="exception_Information">EXCEPTION_INFORMATION =#{exception_Information},</if>
<if test="outbound_Date">OUTBOUND_DATE =#{outbound_Date},</if>
<if test="state!=null">STATE =#{state},</if>
<if test="putinstorage_Date!=null">PUTINSTORAGE_DATE =#{putinstorage_Date},</if>
</set>
where PRODUCTION_TASK_LIST_ID =#{production_Task_List_Id}
</update>
<select id="findProductionTaskListEntityByAcceptNo" resultType="com.yxproject.start.entity.ProductionTaskListEntity" parameterType="String">
select PRODUCTION_TASK_LIST_ID,MAKE_TYPE,OLD_MAKE_TYPE,CITYCODE,WORKSHOP,SUBMIT_DATE,HANDOUT_DATE,IS_PRINT,DOWNLOAD_DATE,PRINT_OUT,PERMANENT_POSITION_DATE,ROLL_OUT_WORKSHOP_DATE,QUALITYINSPECTION_NAME,QUALITYINSPECTION_DATE,EXCEPTION_INFORMATION,OUTBOUND_DATE,PUTINSTORAGE_DATE from PRODUCTION_TASK_LIST left join GROUPINFO on GROUPINFO.CYCLESHEETID = PRODUCTION_TASK_LIST.PRODUCTION_TASK_LIST_ID where GROUPINFO.GROUPNO =#{acceptNo} or GROUPINFO.GROUPNO =substr (#{acceptNo},0,8)
</select>
<select id="findProductionTaskListEntityByState" resultType="com.yxproject.start.entity.ProductionTaskListEntity" parameterType="Integer">
select * from PRODUCTION_TASK_LIST where STATE =#{state }
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/SpecialCardMapper.xml 0 → 100644
View file @ 0806c189
<?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" >
<mapper namespace="com.yxproject.start.mapper.SpecialCardMapper">
<resultMap id="SpecialCardMapper" type="com.yxproject.start.entity.SpecialCardEntity">
<id column="SPECIAL_CARD_ID" property="special_Card_Id" jdbcType="NUMERIC"/>
<result column="ACCEPT_NO" property="accept_No" jdbcType="VARCHAR"/>
<result column="TASK_ID" property="task_Id" jdbcType="NUMERIC"/>
<result column="SPECIAL_TYPE" property="special_Type" jdbcType="NUMERIC"/>
<result column="GROUP_NO" property="group_No" jdbcType="VARCHAR"/>
</resultMap>
<select id="findSpecialCardEntityByAcceptNo" resultType="com.yxproject.start.entity.SpecialCardEntity" parameterType="String">
select * from SPECIAL_CARD where ACCEPT_NO =#{accept_No}
</select>
<insert id="saveSpecialCardEntity" parameterType="com.yxproject.start.entity.SpecialCardEntity">
INSERT INTO SPECIAL_CARD (SPECIAL_CARD_ID, ACCEPT_NO, TASK_ID, SPECIAL_TYPE,GROUP_NO) VALUES (#{special_Card_Id}, #{accept_No}, #{task_Id}, #{special_Type},#{group_No})
</insert>
<update id="updateSpecialCardEntity" parameterType="com.yxproject.start.entity.SpecialCardEntity">
update SPECIAL_CARD
<set>
<if test="accept_No" >accept_No=#{accept_No} </if>
<if test="task_Id" >task_Id=#{task_Id} </if>
<if test="group_No" >group_No=#{group_No} </if>
<if test="special_Type" >special_Type=#{special_Type} </if>
</set>
where special_Card_Id =#{special_Card_Id}
</update>
<select id="findSpecialCardEntityByGroupNo" resultType="com.yxproject.start.entity.SpecialCardEntity" parameterType="String">
select * from SPECIAL_CARD where GROUP_NO =#{group_No}
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/TaskMapper.xml 0 → 100644
View file @ 0806c189
<?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" >
<mapper namespace="com.yxproject.start.mapper.TaskMapper">
<resultMap id="TaskMap" type="com.yxproject.start.entity.TaskEntity">
<id column="TASK_ID" property="task_Id" jdbcType="NUMERIC"/>
<result column="CARD_TYPE" property="card_Type" jdbcType="NUMERIC"/>
<result column="OLD_CARD_TYPE" property="old_Card_Type" jdbcType="NUMERIC"/>
<result column="CITYCODE" property="citycode" jdbcType="VARCHAR"/>
<result column="SUBMIT_DATE" property="submit_Date" jdbcType="DATE"/>
<result column="ISSUED_DATE" property="issued_Date" jdbcType="DATE"/>
<result column="PRINT_STATE" property="print_State" jdbcType="DATE"/>
<result column="DOWNLOAD_DATE" property="download_Date" jdbcType="DATE"/>
<result column="PRINT_OUT_DATE" property="print_Out_Date" jdbcType="DATE"/>
<result column="POSITION_DATE" property="position_Date" jdbcType="DATE"/>
<result column="OUT_WORKSHOP_DATE" property="out_Workshop_Date" jdbcType="DATE"/>
<result column="QUALITY_PEOPLE_NAME" property="quality_People_Name" jdbcType="VARCHAR"/>
<result column="QUALITY_TEST_DATE" property="quality_Test_Date" jdbcType="DATE"/>
<result column="EXCEPTION_INFORMATION" property="exception_Information" jdbcType="VARCHAR"/>
<result column="OUT_STORAGE_DATE" property="out_Storage_Date" jdbcType="DATE"/>
<result column="IN_STORAGE_DATE" property="in_Storage_Date" jdbcType="DATE"/>
<result column="TASK_STATE_ID" property="task_State_Id" jdbcType="NUMERIC"/>
<result column="IS_EXCEPTION" property="is_Exception" jdbcType="NUMERIC"/>
<result column="PRINTER_ID" property="printer_Id" jdbcType="NUMERIC"/>
</resultMap>
<select id="findTaskEntity" resultType="com.yxproject.start.entity.TaskEntity" parameterType="long">
select * from TASK where TASK_ID like #{id}
</select>
<insert id="insertProductionTaskListEntity" parameterType="com.yxproject.start.entity.TaskEntity">
Insert into TASK (TASK_ID,CARD_TYPE,OLD_CARD_TYPE,CITYCODE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,
OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID)
values (#{task_Id},#{card_Type},#{old_Card_Type},#{citycode},#{submit_Date},#{issued_Date},#{print_State},#{download_Date},#{print_Out_Date},#{position_Date},#{out_Workshop_Date},#{quality_People_Name},#{quality_Test_Date},#{exception_Information},#{out_Storage_Date},#{in_Storage_Date},#{task_State_Id},#{is_Exception},#{printer_Id})
</insert>
<update id="updateProductionTask" parameterType="com.yxproject.start.entity.TaskEntity">
update TASK
<set>
<if test="card_Type ">card_Type =#{card_Type},</if>
<if test="old_Card_Type ">old_Card_Type =#{old_Card_Type},</if>
<if test="citycode ">CITYCODE =#{citycode},</if>
<if test="submit_Date">submit_Date =#{submit_Date},</if>
<if test="issued_Date ">issued_Date =#{issued_Date},</if>
<if test="print_State ">print_State =#{print_State},</if>
<if test="download_Date">download_Date =#{download_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="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_Test_Date">quality_Test_Date =#{quality_Test_Date},</if>
<if test="exception_Information">exception_Information =#{exception_Information},</if>
<if test="out_Storage_Date">out_Storage_Date =#{out_Storage_Date},</if>
<if test="in_Storage_Date">in_Storage_Date =#{in_Storage_Date},</if>
<if test="task_State_Id">task_State_Id =#{task_State_Id},</if>
<if test="is_Exception">is_Exception =#{is_Exception},</if>
<if test="printer_Id">printer_Id =#{printer_Id},</if>
</set>
where TASK_ID =#{task_Id}
</update>
<select id="findProductionTaskListEntityByAcceptNo" resultType="com.yxproject.start.entity.TaskEntity" parameterType="String">
select * from TASK left join GROUP_NO on GROUP_NO.TASK_ID = TASK.TASK_ID where GROUP_NO.GROUP_NO =#{acceptNo} or GROUP_NO.GROUP_NO =substr (#{acceptNo},0,8)
</select>
<select id="findProductionTaskListEntityByState" resultType="com.yxproject.start.entity.TaskEntity" parameterType="Integer">
select * from TASK where TASK_STATE_ID =#{state }
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/UtilMapper.xml
View file @ 0806c189
......@@ -16,6 +16,9 @@
<select id="findAcceptInfoSequenceNextValue" resultType="int">
select ACCEPTINFO_SEQ.nextval from dual
</select>
<select id="findPoliceStationApplyReasonSequenceNextValue" resultType="int">
select APPLY_REASON_SEQ.nextval from dual
</select>
</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