Skip to content

Y
YX_IDENT_REFACTORING
Commit 2b873e47 authored by Administrator's avatar Administrator
Browse files
Options

数据核验保存任务单 

更新任务单详情
查询多库证件信息
添加快证制证流程
parent 02d3c3e0
Hide whitespace changes
Inline Side-by-side
Showing with 1207 additions and 856 deletions
pom.xml
View file @ 2b873e47
......@@ -102,6 +102,14 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
</dependency>
</dependencies>
<build>
......
src/main/java/com/yxproject/start/SqlProvider/SqlProvider.java 0 → 100644
View file @ 2b873e47
package com.yxproject.start.SqlProvider;
import com.alibaba.druid.sql.ast.statement.SQLForeignKeyImpl;
import com.alibaba.druid.sql.visitor.functions.If;
import javafx.beans.binding.When;
import org.apache.ibatis.jdbc.SQL;
/**
* Created by zhangyusheng on 2018/10/23 13:52
*/
public class SqlProvider {
public String findCardInfoByCardIDOrAcceptNoAtPRODSql(String card) {
return new SQL() {
{
SELECT("*") ;
FROM("PROD_card_t@PROD_LINK");
if (card.length()==18){
WHERE("id_No=#{idNo}");
}
if (card.length()==10){
WHERE("PROD_card_t.accept_No=#{acceptNo}");
}
}
}.toString();
}
}
src/main/java/com/yxproject/start/api/ShiroApi.java
View file @ 2b873e47
package com.yxproject.start.api;
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.SysPermissionService;
import com.yxproject.start.entity.*;
import com.yxproject.start.service.ProductionTaskListService;
import com.yxproject.start.service.UtilService;
import com.yxproject.start.utils.YXJSONResponse;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import net.sf.json.JSONString;
import com.yxproject.start.service.SysPermissionService;
import com.yxproject.start.service.SysRoleService;
import com.yxproject.start.service.UserInfoService;
import com.yxproject.start.utils.YXJSONResponse;
import net.sf.json.JSONObject;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.IncorrectCredentialsException;
......@@ -22,21 +16,17 @@ import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.Context;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author Administrator
*/
......@@ -44,8 +34,7 @@ import java.util.Map;
public class ShiroApi {
@Autowired
private ProductionTaskListService productionTaskListService;
@Autowired
private UtilService utilService;
@Autowired
private UserInfoService userInfoService;
......@@ -245,14 +234,47 @@ 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);
ProductionTaskListEntity productionTaskListEntity = (ProductionTaskListEntity)jsonObject.toBean(jsonObject, ProductionTaskListEntity.class);
int production_task_list_seq = utilService.findProductionTaskListSequenceNextValue();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyymmdd");
productionTaskListEntity.setProductionTaskListId(simpleDateFormat.format(new Date())+production_task_list_seq);
Object productionTaskList = jsonObject.get("productionTaskList");
Object groupInfoList = jsonObject.get("groupInfoList");
List<GroupinfoEntity> groupinfoEntities = (List<GroupinfoEntity>)groupInfoList;
ProductionTaskListEntity productionTaskListEntity = (ProductionTaskListEntity)productionTaskList;
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
int i = productionTaskListService.addProductionTaskListEntity(productionTaskListEntity);
yxjsonResponse.outPutSuccess(i+"更新成功");
int i = productionTaskListService.addProductionTaskListEntity(productionTaskListEntity,groupinfoEntities);
yxjsonResponse.outPutSuccess(i+"添加成功");
return yxjsonResponse.toJSONString();
}
/**
* 查询证件信息;
* @return
*/
@RequestMapping(value = "/findCardInfoByCardIDOrAcceptNo",method = RequestMethod.GET)
@RequiresPermissions("userInfo.add")//权限管理;
@ResponseBody
public String findCardInfoByCardIDOrAcceptNo(@RequestParam("id") String id,@Context HttpServletResponse resp){
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
List<Object> cardInfoByCardIDOrAcceptNo = productionTaskListService.findCardInfoByCardIDOrAcceptNo(id);
yxjsonResponse.outPutSuccess(cardInfoByCardIDOrAcceptNo);
return yxjsonResponse.toJSONString();
}
/**
* 添加快证任务单;
* @return
*/
@RequestMapping(value = "/addQuickCyclesheetInfo",method = RequestMethod.GET)
@RequiresPermissions("userInfo.add")//权限管理;
@ResponseBody
public String addQuickCyclesheetInfo(@RequestParam("id") String id,@Context HttpServletResponse resp){
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
int i = productionTaskListService.addQuickCyclesheetInfo(id);
yxjsonResponse.outPutSuccess(i+"添加成功");
return yxjsonResponse.toJSONString();
}
......
src/main/java/com/yxproject/start/api/UserInfoApi.java
View file @ 2b873e47
package com.yxproject.start.api;
import com.yxproject.start.entity.SysPermission;
import com.yxproject.start.entity.SysRole;
import com.yxproject.start.entity.UserInfo;
import com.yxproject.start.entity.*;
import com.yxproject.start.service.ProductionTaskListService;
import com.yxproject.start.service.SysPermissionService;
import com.yxproject.start.service.SysRoleService;
import com.yxproject.start.service.UserInfoService;
import com.yxproject.start.service.impl.UserInfoServiceImpl;
import com.yxproject.start.utils.Md5Utils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.IncorrectCredentialsException;
import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authz.Permission;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.UUID;
import java.util.*;
/**
......@@ -366,7 +358,7 @@ public class UserInfoApi {
@GET
@RequestMapping("selectAllUser")
@Produces(MediaType.APPLICATION_JSON)
public List<UserInfo> selectAllUser() {
public List<UserInfo> selectAllUser() {
List<UserInfo> list = userInfoService.getAllUserInfo();
return list;
......
src/main/java/com/yxproject/start/config/DataSourceConfig.java deleted 100644 → 0
View file @ 02d3c3e0
package com.yxproject.start.config;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import javax.sql.DataSource;
/**
* @项目名称：wyait-common
* @包名：com.wyait.manage.config
* @类描述：数据源配置
* @创建人：wyait
* @创建时间：2018-02-27 13:33
* @version：V1.0
*/
@Configuration
//指明了扫描dao层，并且给dao层注入指定的SqlSessionTemplate
@MapperScan(basePackages = "com.yxproject.start.mapper", sqlSessionTemplateRef = "testSqlSessionTemplate")
public class DataSourceConfig {
/**
* 创建datasource对象
* @return
*/
@Bean(name = "testDataSource")
@ConfigurationProperties(prefix = "slave.datasource.test")// prefix值必须是application.properteis中对应属性的前缀
@Primary
public DataSource testDataSource() {
return DataSourceBuilder.create().build();
}
/**
* 创建sql工程
* @param dataSource
* @return
* @throws Exception
*/
@Bean(name = "testSqlSessionFactory")
@Primary
public SqlSessionFactory testSqlSessionFactory(@Qualifier("testDataSource") DataSource dataSource) throws Exception {
SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
bean.setDataSource(dataSource);
//对应mybatis.type-aliases-package配置
bean.setTypeAliasesPackage("com.yxproject.start.entity");
//对应mybatis.mapper-locations配置
bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/*.xml"));
//开启驼峰映射
bean.getObject().getConfiguration().setMapUnderscoreToCamelCase(true);
return bean.getObject();
}
/**
* 配置事务管理
* @param dataSource
* @return
*/
@Bean(name = "testTransactionManager")
@Primary
public DataSourceTransactionManager testTransactionManager(@Qualifier("testDataSource") DataSource dataSource) {
return new DataSourceTransactionManager(dataSource);
}
/**
* sqlSession模版，用于配置自动扫描pojo实体类
* @param sqlSessionFactory
* @return
* @throws Exception
*/
@Bean(name = "testSqlSessionTemplate")
@Primary
public SqlSessionTemplate testSqlSessionTemplate(@Qualifier("testSqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
return new SqlSessionTemplate(sqlSessionFactory);
}
}
src/main/java/com/yxproject/start/config/ShiroConfig.java
View file @ 2b873e47
......@@ -7,6 +7,7 @@ import com.yxproject.start.utils.DynamicDataSource;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.realm.Realm;
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
......@@ -22,10 +23,7 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
import javax.sql.DataSource;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
import java.util.*;
/**
* @author Administrator
......@@ -97,13 +95,18 @@ public class ShiroConfig {
@Bean
public SecurityManager securityManager(){
DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
securityManager.setRealm(myShiroRealm());
List<Realm> realms = new ArrayList<>();
realms.add(myShiroRealm());
securityManager.setRealms(realms);
return securityManager;
}
/**
* 开启shiro aop注解支持.
* 使用代理方式;所以需要开启代码支持;
......
src/main/java/com/yxproject/start/entity/GroupinfoEntity.java
View file @ 2b873e47
......@@ -8,9 +8,11 @@ import java.util.Objects;
public class GroupinfoEntity {
private String groupid;
private String groupno;
private String cyclesheetid;
private Long grouptype;
private Long vaildCount;
private Long invalidCount;
private Long valid_Count;
private Long invalid_Count;
@Id
@Column(name = "GROUPID", nullable = false, length = 20)
......@@ -32,6 +34,16 @@ public class GroupinfoEntity {
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 = "GROUPTYPE", nullable = true, precision = 0)
public Long getGrouptype() {
......@@ -41,25 +53,23 @@ public class GroupinfoEntity {
public void setGrouptype(Long grouptype) {
this.grouptype = grouptype;
}
@Basic
@Column(name = "VAILD_COUNT", nullable = true, precision = 0)
public Long getVaildCount() {
return vaildCount;
public Long getValid_Count() {
return valid_Count;
}
public void setVaildCount(Long vaildCount) {
this.vaildCount = vaildCount;
public void setValid_Count(Long valid_Count) {
this.valid_Count = valid_Count;
}
@Basic
@Column(name = "INVALID_COUNT", nullable = true, precision = 0)
public Long getInvalidCount() {
return invalidCount;
public Long getInvalid_Count() {
return invalid_Count;
}
public void setInvalidCount(Long invalidCount) {
this.invalidCount = invalidCount;
public void setInvalid_Count(Long invalid_Count) {
this.invalid_Count = invalid_Count;
}
@Override
......@@ -69,13 +79,14 @@ public class GroupinfoEntity {
GroupinfoEntity that = (GroupinfoEntity) o;
return Objects.equals(groupid, that.groupid) &&
Objects.equals(groupno, that.groupno) &&
Objects.equals(cyclesheetid, that.cyclesheetid) &&
Objects.equals(grouptype, that.grouptype) &&
Objects.equals(vaildCount, that.vaildCount) &&
Objects.equals(invalidCount, that.invalidCount);
Objects.equals(valid_Count, that.valid_Count) &&
Objects.equals(invalid_Count, that.invalid_Count);
}
@Override
public int hashCode() {
return Objects.hash(groupid, groupno, grouptype, vaildCount, invalidCount);
return Objects.hash(groupid, groupno,cyclesheetid, grouptype, valid_Count, invalid_Count);
}
}
src/main/java/com/yxproject/start/entity/ProductionTaskListEntity.java
View file @ 2b873e47
......@@ -6,52 +6,49 @@ import java.util.Objects;
@Entity
@Table(name = "PRODUCTION_TASK_LIST", schema = "DAHAI", catalog = "")
public class ProductionTaskListEntity {
private String productionTaskListId;
private long makeType;
private Long oldMakeType;
private String production_TaskList_Id;
private long make_Type;
private Long old_Make_Type;
private String workshop;
private String citycode;
private String submitDate;
private String handoutDate;
private Long isPrint;
private String downloadDate;
private String printOut;
private String permanentPositionDate;
private String rollOutWorkshopDate;
private String qualityinspectionName;
private String qualityinspectionDate;
private String exceptionInformation;
private String outboundDate;
private String putinstorageDate;
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;
@Id
@Column(name = "PRODUCTION_TASK_LIST_ID", nullable = false, length = 20)
public String getProductionTaskListId() {
return productionTaskListId;
public String getProduction_TaskList_Id() {
return production_TaskList_Id;
}
public void setProductionTaskListId(String productionTaskListId) {
this.productionTaskListId = productionTaskListId;
public void setProduction_TaskList_Id(String production_TaskList_Id) {
this.production_TaskList_Id = production_TaskList_Id;
}
@Basic
@Column(name = "MAKE_TYPE", nullable = false, precision = 0)
public long getMakeType() {
return makeType;
public long getMake_Type() {
return make_Type;
}
public void setMakeType(long makeType) {
this.makeType = makeType;
public void setMake_Type(long make_Type) {
this.make_Type = make_Type;
}
@Basic
@Column(name = "OLD_MAKE_TYPE", nullable = true, precision = 0)
public Long getOldMakeType() {
return oldMakeType;
public Long getOld_Make_Type() {
return old_Make_Type;
}
public void setOldMakeType(Long oldMakeType) {
this.oldMakeType = oldMakeType;
public void setOld_Make_Type(Long old_Make_Type) {
this.old_Make_Type = old_Make_Type;
}
@Basic
@Column(name = "CITYCODE",nullable = true, length = 8)
......@@ -73,125 +70,113 @@ public class ProductionTaskListEntity {
public void setWorkshop(String workshop) {
this.workshop = workshop;
}
@Basic
@Column(name = "SUBMIT_DATE", nullable = true, length = 8)
public String getSubmitDate() {
return submitDate;
public String getSubmit_Date() {
return submit_Date;
}
public void setSubmitDate(String submitDate) {
this.submitDate = submitDate;
public void setSubmit_Date(String submit_Date) {
this.submit_Date = submit_Date;
}
@Basic
@Column(name = "HANDOUT_DATE", nullable = true, length = 8)
public String getHandoutDate() {
return handoutDate;
public String getHandout_Date() {
return handout_Date;
}
public void setHandoutDate(String handoutDate) {
this.handoutDate = handoutDate;
public void setHandout_Date(String handout_Date) {
this.handout_Date = handout_Date;
}
@Basic
@Column(name = "IS_PRINT", nullable = true, precision = 0)
public Long getIsPrint() {
return isPrint;
public Long getIs_Print() {
return is_Print;
}
public void setIsPrint(Long isPrint) {
this.isPrint = isPrint;
public void setIs_Print(Long is_Print) {
this.is_Print = is_Print;
}
@Basic
@Column(name = "DOWNLOAD_DATE", nullable = true, length = 8)
public String getDownloadDate() {
return downloadDate;
public String getDownload_Date() {
return download_Date;
}
public void setDownloadDate(String downloadDate) {
this.downloadDate = downloadDate;
public void setDownload_Date(String download_Date) {
this.download_Date = download_Date;
}
@Basic
@Column(name = "PRINT_OUT", nullable = true, length = 8)
public String getPrintOut() {
return printOut;
public String getPrint_Out() {
return print_Out;
}
public void setPrintOut(String printOut) {
this.printOut = printOut;
public void setPrint_Out(String print_Out) {
this.print_Out = print_Out;
}
@Basic
@Column(name = "PERMANENT_POSITION_DATE", nullable = true, length = 8)
public String getPermanentPositionDate() {
return permanentPositionDate;
public String getPermanent_Position_Date() {
return permanent_Position_Date;
}
public void setPermanentPositionDate(String permanentPositionDate) {
this.permanentPositionDate = permanentPositionDate;
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 getRollOutWorkshopDate() {
return rollOutWorkshopDate;
public String getRoll_Out_Workshop_Date() {
return roll_Out_Workshop_Date;
}
public void setRollOutWorkshopDate(String rollOutWorkshopDate) {
this.rollOutWorkshopDate = rollOutWorkshopDate;
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 getQualityinspectionName() {
return qualityinspectionName;
public String getQualityinspection_Name() {
return qualityinspection_Name;
}
public void setQualityinspectionName(String qualityinspectionName) {
this.qualityinspectionName = qualityinspectionName;
public void setQualityinspection_Name(String qualityinspection_Name) {
this.qualityinspection_Name = qualityinspection_Name;
}
@Basic
@Column(name = "QUALITYINSPECTION_DATE", nullable = true, length = 8)
public String getQualityinspectionDate() {
return qualityinspectionDate;
public String getQualityinspection_Date() {
return qualityinspection_Date;
}
public void setQualityinspectionDate(String qualityinspectionDate) {
this.qualityinspectionDate = qualityinspectionDate;
public void setQualityinspection_Date(String qualityinspection_Date) {
this.qualityinspection_Date = qualityinspection_Date;
}
@Basic
@Column(name = "EXCEPTION_INFORMATION", nullable = true, length = 120)
public String getExceptionInformation() {
return exceptionInformation;
public String getException_Information() {
return exception_Information;
}
public void setExceptionInformation(String exceptionInformation) {
this.exceptionInformation = exceptionInformation;
public void setException_Information(String exception_Information) {
this.exception_Information = exception_Information;
}
@Basic
@Column(name = "OUTBOUND_DATE", nullable = true, length = 8)
public String getOutboundDate() {
return outboundDate;
public String getOutbound_Date() {
return outbound_Date;
}
public void setOutboundDate(String outboundDate) {
this.outboundDate = outboundDate;
public void setOutbound_Date(String outbound_Date) {
this.outbound_Date = outbound_Date;
}
@Basic
@Column(name = "PUTINSTORAGE_DATE", nullable = true, length = 8)
public String getPutinstorageDate() {
return putinstorageDate;
public String getPutinstorage_Date() {
return putinstorage_Date;
}
public void setPutinstorageDate(String putinstorageDate) {
this.putinstorageDate = putinstorageDate;
public void setPutinstorage_Date(String putinstorage_Date) {
this.putinstorage_Date = putinstorage_Date;
}
@Override
......@@ -199,27 +184,27 @@ public class ProductionTaskListEntity {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ProductionTaskListEntity that = (ProductionTaskListEntity) o;
return makeType == that.makeType &&
Objects.equals(productionTaskListId, that.productionTaskListId) &&
Objects.equals(oldMakeType, that.oldMakeType) &&
return make_Type == that.make_Type &&
Objects.equals(production_TaskList_Id, that.production_TaskList_Id) &&
Objects.equals(old_Make_Type, that.old_Make_Type) &&
Objects.equals(citycode, that.citycode) &&
Objects.equals(workshop, that.workshop) &&
Objects.equals(submitDate, that.submitDate) &&
Objects.equals(handoutDate, that.handoutDate) &&
Objects.equals(isPrint, that.isPrint) &&
Objects.equals(downloadDate, that.downloadDate) &&
Objects.equals(printOut, that.printOut) &&
Objects.equals(permanentPositionDate, that.permanentPositionDate) &&
Objects.equals(rollOutWorkshopDate, that.rollOutWorkshopDate) &&
Objects.equals(qualityinspectionName, that.qualityinspectionName) &&
Objects.equals(qualityinspectionDate, that.qualityinspectionDate) &&
Objects.equals(exceptionInformation, that.exceptionInformation) &&
Objects.equals(outboundDate, that.outboundDate) &&
Objects.equals(putinstorageDate, that.putinstorageDate);
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(putinstorage_Date, that.putinstorage_Date);
}
@Override
public int hashCode() {
return Objects.hash(productionTaskListId, makeType, oldMakeType, citycode,workshop, submitDate, handoutDate, isPrint, downloadDate, printOut, permanentPositionDate, rollOutWorkshopDate, qualityinspectionName, qualityinspectionDate, exceptionInformation, outboundDate, putinstorageDate);
return Objects.hash(production_TaskList_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);
}
}
src/main/java/com/yxproject/start/entity/accu/AccCardTEntity.java
View file @ 2b873e47
......@@ -6,52 +6,50 @@ import java.util.Objects;
@Entity
@Table(name = "ACC_CARD_T", schema = "ACC_DBA", catalog = "")
public class AccCardTEntity {
private String uploadNo;
private String acceptNo;
private String photoNo;
private String upload_No;
private String accept_No;
private String photo_No;
private String name;
private String sexNo;
private String nationNo;
private String sex_No;
private String nation_No;
private String birthday;
private String idNo;
private String id_No;
private String addr1;
private String addr2;
private String addr3;
private String address1;
private String signGovt;
private String expireDate;
private String beginDate;
private String applyReason;
private String statusNo;
private String sign_Govt;
private String expire_Date;
private String begin_Date;
private String apply_Reason;
private String status_No;
@Basic
@Column(name = "UPLOAD_NO", nullable = false, length = 22)
public String getUploadNo() {
return uploadNo;
public String getUpload_No() {
return upload_No;
}
public void setUploadNo(String uploadNo) {
this.uploadNo = uploadNo;
public void setUpload_No(String upload_No) {
this.upload_No = upload_No;
}
@Id
@Column(name = "ACCEPT_NO", nullable = false, length = 12)
public String getAcceptNo() {
return acceptNo;
public String getAccept_No() {
return accept_No;
}
public void setAcceptNo(String acceptNo) {
this.acceptNo = acceptNo;
public void setAccept_No(String accept_No) {
this.accept_No = accept_No;
}
@Basic
@Column(name = "PHOTO_NO", nullable = true, length = 12)
public String getPhotoNo() {
return photoNo;
public String getPhoto_No() {
return photo_No;
}
public void setPhotoNo(String photoNo) {
this.photoNo = photoNo;
public void setPhoto_No(String photo_No) {
this.photo_No = photo_No;
}
@Basic
......@@ -63,25 +61,23 @@ public class AccCardTEntity {
public void setName(String name) {
this.name = name;
}
@Basic
@Column(name = "SEX_NO", nullable = false, length = 1)
public String getSexNo() {
return sexNo;
public String getSex_No() {
return sex_No;
}
public void setSexNo(String sexNo) {
this.sexNo = sexNo;
public void setSex_No(String sex_No) {
this.sex_No = sex_No;
}
@Basic
@Column(name = "NATION_NO", nullable = false, length = 2)
public String getNationNo() {
return nationNo;
public String getNation_No() {
return nation_No;
}
public void setNationNo(String nationNo) {
this.nationNo = nationNo;
public void setNation_No(String nation_No) {
this.nation_No = nation_No;
}
@Basic
......@@ -93,15 +89,14 @@ public class AccCardTEntity {
public void setBirthday(String birthday) {
this.birthday = birthday;
}
@Basic
@Column(name = "ID_NO", nullable = false, length = 18)
public String getIdNo() {
return idNo;
public String getId_No() {
return id_No;
}
public void setIdNo(String idNo) {
this.idNo = idNo;
public void setId_No(String id_No) {
this.id_No = id_No;
}
@Basic
......@@ -143,55 +138,50 @@ public class AccCardTEntity {
public void setAddress1(String address1) {
this.address1 = address1;
}
@Basic
@Column(name = "SIGN_GOVT", nullable = false, length = 45)
public String getSignGovt() {
return signGovt;
public String getSign_Govt() {
return sign_Govt;
}
public void setSignGovt(String signGovt) {
this.signGovt = signGovt;
public void setSign_Govt(String sign_Govt) {
this.sign_Govt = sign_Govt;
}
@Basic
@Column(name = "EXPIRE_DATE", nullable = false, length = 8)
public String getExpireDate() {
return expireDate;
public String getExpire_Date() {
return expire_Date;
}
public void setExpireDate(String expireDate) {
this.expireDate = expireDate;
public void setExpire_Date(String expire_Date) {
this.expire_Date = expire_Date;
}
@Basic
@Column(name = "BEGIN_DATE", nullable = false, length = 8)
public String getBeginDate() {
return beginDate;
public String getBegin_Date() {
return begin_Date;
}
public void setBeginDate(String beginDate) {
this.beginDate = beginDate;
public void setBegin_Date(String begin_Date) {
this.begin_Date = begin_Date;
}
@Basic
@Column(name = "APPLY_REASON", nullable = false, length = 2)
public String getApplyReason() {
return applyReason;
public String getApply_Reason() {
return apply_Reason;
}
public void setApplyReason(String applyReason) {
this.applyReason = applyReason;
public void setApply_Reason(String apply_Reason) {
this.apply_Reason = apply_Reason;
}
@Basic
@Column(name = "STATUS_NO", nullable = true, length = 1)
public String getStatusNo() {
return statusNo;
public String getStatus_No() {
return status_No;
}
public void setStatusNo(String statusNo) {
this.statusNo = statusNo;
public void setStatus_No(String status_No) {
this.status_No = status_No;
}
@Override
......@@ -199,27 +189,28 @@ public class AccCardTEntity {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
AccCardTEntity that = (AccCardTEntity) o;
return Objects.equals(uploadNo, that.uploadNo) &&
Objects.equals(acceptNo, that.acceptNo) &&
Objects.equals(photoNo, that.photoNo) &&
return Objects.equals(upload_No, that.upload_No) &&
Objects.equals(accept_No, that.accept_No) &&
Objects.equals(photo_No, that.photo_No) &&
Objects.equals(name, that.name) &&
Objects.equals(sexNo, that.sexNo) &&
Objects.equals(nationNo, that.nationNo) &&
Objects.equals(sex_No, that.sex_No) &&
Objects.equals(nation_No, that.nation_No) &&
Objects.equals(birthday, that.birthday) &&
Objects.equals(idNo, that.idNo) &&
Objects.equals(id_No, that.id_No) &&
Objects.equals(addr1, that.addr1) &&
Objects.equals(addr2, that.addr2) &&
Objects.equals(addr3, that.addr3) &&
Objects.equals(address1, that.address1) &&
Objects.equals(signGovt, that.signGovt) &&
Objects.equals(expireDate, that.expireDate) &&
Objects.equals(beginDate, that.beginDate) &&
Objects.equals(applyReason, that.applyReason) &&
Objects.equals(statusNo, that.statusNo);
Objects.equals(sign_Govt, that.sign_Govt) &&
Objects.equals(expire_Date, that.expire_Date) &&
Objects.equals(begin_Date, that.begin_Date) &&
Objects.equals(apply_Reason, that.apply_Reason) &&
Objects.equals(status_No, that.status_No);
}
@Override
public int hashCode() {
return Objects.hash(uploadNo, acceptNo, photoNo, name, sexNo, nationNo, birthday, idNo, addr1, addr2, addr3, address1, signGovt, expireDate, beginDate, applyReason, statusNo);
return Objects.hash(upload_No, accept_No, photo_No, name, sex_No, nation_No, birthday, id_No, addr1, addr2, addr3, address1, sign_Govt, expire_Date, begin_Date, apply_Reason, status_No);
}
}
src/main/java/com/yxproject/start/entity/accu/AccGroupRelationTEntity.java
View file @ 2b873e47
......@@ -6,60 +6,55 @@ import java.util.Objects;
@Entity
@Table(name = "ACC_GROUP_RELATION_T", schema = "ACC_DBA", catalog = "")
public class AccGroupRelationTEntity {
private String groupNo;
private String originalNo;
private String dealStatus;
private String dealDate;
private String uploadUnitNo;
private String group_No;
private String original_No;
private String deal_Status;
private String deal_Date;
private String upload_Unit_No;
@Id
@Column(name = "GROUP_NO", nullable = false, length = 10)
public String getGroupNo() {
return groupNo;
public String getGroup_No() {
return group_No;
}
public void setGroupNo(String groupNo) {
this.groupNo = groupNo;
public void setGroup_No(String group_No) {
this.group_No = group_No;
}
@Basic
@Column(name = "ORIGINAL_NO", nullable = false, length = 25)
public String getOriginalNo() {
return originalNo;
public String getOriginal_No() {
return original_No;
}
public void setOriginalNo(String originalNo) {
this.originalNo = originalNo;
public void setOriginal_No(String original_No) {
this.original_No = original_No;
}
@Basic
@Column(name = "DEAL_STATUS", nullable = true, length = 1)
public String getDealStatus() {
return dealStatus;
public String getDeal_Status() {
return deal_Status;
}
public void setDealStatus(String dealStatus) {
this.dealStatus = dealStatus;
public void setDeal_Status(String deal_Status) {
this.deal_Status = deal_Status;
}
@Basic
@Column(name = "DEAL_DATE", nullable = false, length = 8)
public String getDealDate() {
return dealDate;
public String getDeal_Date() {
return deal_Date;
}
public void setDealDate(String dealDate) {
this.dealDate = dealDate;
public void setDeal_Date(String deal_Date) {
this.deal_Date = deal_Date;
}
@Basic
@Column(name = "UPLOAD_UNIT_NO", nullable = false, length = 12)
public String getUploadUnitNo() {
return uploadUnitNo;
public String getUpload_Unit_No() {
return upload_Unit_No;
}
public void setUploadUnitNo(String uploadUnitNo) {
this.uploadUnitNo = uploadUnitNo;
public void setUpload_Unit_No(String upload_Unit_No) {
this.upload_Unit_No = upload_Unit_No;
}
@Override
......@@ -67,15 +62,15 @@ public class AccGroupRelationTEntity {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
AccGroupRelationTEntity that = (AccGroupRelationTEntity) o;
return Objects.equals(groupNo, that.groupNo) &&
Objects.equals(originalNo, that.originalNo) &&
Objects.equals(dealStatus, that.dealStatus) &&
Objects.equals(dealDate, that.dealDate) &&
Objects.equals(uploadUnitNo, that.uploadUnitNo);
return Objects.equals(group_No, that.group_No) &&
Objects.equals(original_No, that.original_No) &&
Objects.equals(deal_Status, that.deal_Status) &&
Objects.equals(deal_Date, that.deal_Date) &&
Objects.equals(upload_Unit_No, that.upload_Unit_No);
}
@Override
public int hashCode() {
return Objects.hash(groupNo, originalNo, dealStatus, dealDate, uploadUnitNo);
return Objects.hash(group_No, original_No, deal_Status, deal_Date, upload_Unit_No);
}
}
src/main/java/com/yxproject/start/entity/accu/AccGroupTEntity.java
View file @ 2b873e47
......@@ -7,93 +7,85 @@ import java.util.Objects;
@Entity
@Table(name = "ACC_GROUP_T", schema = "ACC_DBA", catalog = "")
public class AccGroupTEntity {
private String groupNo;
private String userCode;
private Time importTime;
private String dealFlag;
private Byte validCount;
private Byte invalidCount;
private Time submitDate;
private String submitCode;
private String group_No;
private String user_Code;
private Time import_Time;
private String deal_Flag;
private Byte valid_Count;
private Byte invalid_Count;
private Time submit_Date;
private String submit_Code;
@Id
@Column(name = "GROUP_NO", nullable = false, length = 10)
public String getGroupNo() {
return groupNo;
public String getGroup_No() {
return group_No;
}
public void setGroupNo(String groupNo) {
this.groupNo = groupNo;
public void setGroup_No(String group_No) {
this.group_No = group_No;
}
@Basic
@Column(name = "USER_CODE", nullable = true, length = 8)
public String getUserCode() {
return userCode;
public String getUser_Code() {
return user_Code;
}
public void setUserCode(String userCode) {
this.userCode = userCode;
public void setUser_Code(String user_Code) {
this.user_Code = user_Code;
}
@Basic
@Column(name = "IMPORT_TIME", nullable = true)
public Time getImportTime() {
return importTime;
public Time getImport_Time() {
return import_Time;
}
public void setImportTime(Time importTime) {
this.importTime = importTime;
public void setImport_Time(Time import_Time) {
this.import_Time = import_Time;
}
@Basic
@Column(name = "DEAL_FLAG", nullable = false, length = 1)
public String getDealFlag() {
return dealFlag;
public String getDeal_Flag() {
return deal_Flag;
}
public void setDealFlag(String dealFlag) {
this.dealFlag = dealFlag;
public void setDeal_Flag(String deal_Flag) {
this.deal_Flag = deal_Flag;
}
@Basic
@Column(name = "VALID_COUNT", nullable = true, precision = 0)
public Byte getValidCount() {
return validCount;
public Byte getValid_Count() {
return valid_Count;
}
public void setValidCount(Byte validCount) {
this.validCount = validCount;
public void setValid_Count(Byte valid_Count) {
this.valid_Count = valid_Count;
}
@Basic
@Column(name = "INVALID_COUNT", nullable = true, precision = 0)
public Byte getInvalidCount() {
return invalidCount;
public Byte getInvalid_Count() {
return invalid_Count;
}
public void setInvalidCount(Byte invalidCount) {
this.invalidCount = invalidCount;
public void setInvalid_Count(Byte invalid_Count) {
this.invalid_Count = invalid_Count;
}
@Basic
@Column(name = "SUBMIT_DATE", nullable = true)
public Time getSubmitDate() {
return submitDate;
public Time getSubmit_Date() {
return submit_Date;
}
public void setSubmitDate(Time submitDate) {
this.submitDate = submitDate;
public void setSubmit_Date(Time submit_Date) {
this.submit_Date = submit_Date;
}
@Basic
@Column(name = "SUBMIT_CODE", nullable = true, length = 8)
public String getSubmitCode() {
return submitCode;
public String getSubmit_Code() {
return submit_Code;
}
public void setSubmitCode(String submitCode) {
this.submitCode = submitCode;
public void setSubmit_Code(String submit_Code) {
this.submit_Code = submit_Code;
}
@Override
......@@ -101,18 +93,18 @@ public class AccGroupTEntity {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
AccGroupTEntity that = (AccGroupTEntity) o;
return Objects.equals(groupNo, that.groupNo) &&
Objects.equals(userCode, that.userCode) &&
Objects.equals(importTime, that.importTime) &&
Objects.equals(dealFlag, that.dealFlag) &&
Objects.equals(validCount, that.validCount) &&
Objects.equals(invalidCount, that.invalidCount) &&
Objects.equals(submitDate, that.submitDate) &&
Objects.equals(submitCode, that.submitCode);
return Objects.equals(group_No, that.group_No) &&
Objects.equals(user_Code, that.user_Code) &&
Objects.equals(import_Time, that.import_Time) &&
Objects.equals(deal_Flag, that.deal_Flag) &&
Objects.equals(valid_Count, that.valid_Count) &&
Objects.equals(invalid_Count, that.invalid_Count) &&
Objects.equals(submit_Date, that.submit_Date) &&
Objects.equals(submit_Code, that.submit_Code);
}
@Override
public int hashCode() {
return Objects.hash(groupNo, userCode, importTime, dealFlag, validCount, invalidCount, submitDate, submitCode);
return Objects.hash(group_No, user_Code, import_Time, deal_Flag, valid_Count, invalid_Count, submit_Date, submit_Code);
}
}
src/main/java/com/yxproject/start/entity/prod/ProdApplyInfoTEntity.java
View file @ 2b873e47
......@@ -6,124 +6,117 @@ import java.util.Objects;
@Entity
@Table(name = "PROD_APPLY_INFO_T", schema = "PROD_DBA", catalog = "")
public class ProdApplyInfoTEntity {
private String uploadNo;
private String acceptNo;
private String makeType;
private String applyName;
private String applyPhone;
private String applyPostcode;
private String applyAddress;
private String drawType;
private String provinceNo;
private String upload_No;
private String accept_No;
private String make_Type;
private String apply_Name;
private String apply_Phone;
private String apply_Postcode;
private String apply_Address;
private String draw_Type;
private String province_No;
@Basic
@Column(name = "UPLOAD_NO", nullable = false, length = 22)
public String getUploadNo() {
return uploadNo;
public String getUpload_No() {
return upload_No;
}
public void setUploadNo(String uploadNo) {
this.uploadNo = uploadNo;
public void setUpload_No(String upload_No) {
this.upload_No = upload_No;
}
@Id
@Column(name = "ACCEPT_NO", nullable = false, length = 12)
public String getAcceptNo() {
return acceptNo;
public String getAccept_No() {
return accept_No;
}
public void setAcceptNo(String acceptNo) {
this.acceptNo = acceptNo;
public void setAccept_No(String accept_No) {
this.accept_No = accept_No;
}
@Basic
@Column(name = "MAKE_TYPE", nullable = true, length = 1)
public String getMakeType() {
return makeType;
public String getMake_Type() {
return make_Type;
}
public void setMakeType(String makeType) {
this.makeType = makeType;
public void setMake_Type(String make_Type) {
this.make_Type = make_Type;
}
@Basic
@Column(name = "APPLY_NAME", nullable = true, length = 45)
public String getApplyName() {
return applyName;
public String getApply_Name() {
return apply_Name;
}
public void setApplyName(String applyName) {
this.applyName = applyName;
public void setApply_Name(String apply_Name) {
this.apply_Name = apply_Name;
}
@Basic
@Column(name = "APPLY_PHONE", nullable = true, length = 20)
public String getApplyPhone() {
return applyPhone;
public String getApply_Phone() {
return apply_Phone;
}
public void setApplyPhone(String applyPhone) {
this.applyPhone = applyPhone;
public void setApply_Phone(String apply_Phone) {
this.apply_Phone = apply_Phone;
}
@Basic
@Column(name = "APPLY_POSTCODE", nullable = true, length = 6)
public String getApplyPostcode() {
return applyPostcode;
public String getApply_Postcode() {
return apply_Postcode;
}
public void setApplyPostcode(String applyPostcode) {
this.applyPostcode = applyPostcode;
public void setApply_Postcode(String apply_Postcode) {
this.apply_Postcode = apply_Postcode;
}
@Basic
@Column(name = "APPLY_ADDRESS", nullable = true, length = 105)
public String getApplyAddress() {
return applyAddress;
public String getApply_Address() {
return apply_Address;
}
public void setApplyAddress(String applyAddress) {
this.applyAddress = applyAddress;
public void setApply_Address(String apply_Address) {
this.apply_Address = apply_Address;
}
@Basic
@Column(name = "DRAW_TYPE", nullable = false, length = 2)
public String getDrawType() {
return drawType;
public String getDraw_Type() {
return draw_Type;
}
public void setDrawType(String drawType) {
this.drawType = drawType;
public void setDraw_Type(String draw_Type) {
this.draw_Type = draw_Type;
}
@Basic
@Column(name = "PROVINCE_NO", nullable = true, length = 6)
public String getProvinceNo() {
return provinceNo;
public String getProvince_No() {
return province_No;
}
public void setProvinceNo(String provinceNo) {
this.provinceNo = provinceNo;
public void setProvince_No(String province_No) {
this.province_No = province_No;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ProdApplyInfoTEntity that = (ProdApplyInfoTEntity) o;
return Objects.equals(uploadNo, that.uploadNo) &&
Objects.equals(acceptNo, that.acceptNo) &&
Objects.equals(makeType, that.makeType) &&
Objects.equals(applyName, that.applyName) &&
Objects.equals(applyPhone, that.applyPhone) &&
Objects.equals(applyPostcode, that.applyPostcode) &&
Objects.equals(applyAddress, that.applyAddress) &&
Objects.equals(drawType, that.drawType) &&
Objects.equals(provinceNo, that.provinceNo);
return Objects.equals(upload_No, that.upload_No) &&
Objects.equals(accept_No, that.accept_No) &&
Objects.equals(make_Type, that.make_Type) &&
Objects.equals(apply_Name, that.apply_Name) &&
Objects.equals(apply_Phone, that.apply_Phone) &&
Objects.equals(apply_Postcode, that.apply_Postcode) &&
Objects.equals(apply_Address, that.apply_Address) &&
Objects.equals(draw_Type, that.draw_Type) &&
Objects.equals(province_No, that.province_No);
}
@Override
public int hashCode() {
return Objects.hash(uploadNo, acceptNo, makeType, applyName, applyPhone, applyPostcode, applyAddress, drawType, provinceNo);
return Objects.hash(upload_No, accept_No, make_Type, apply_Name, apply_Phone, apply_Postcode, apply_Address, draw_Type, province_No);
}
}
src/main/java/com/yxproject/start/entity/prod/ProdCardTEntity.java
View file @ 2b873e47
package com.yxproject.start.entity.prod;
import com.yxproject.start.entity.accu.AccCardTEntity;
import javax.persistence.*;
import java.util.Objects;
@Entity
@Table(name = "PROD_CARD_T", schema = "PROD_DBA", catalog = "")
public class ProdCardTEntity {
private String uploadNo;
private String acceptNo;
private String photoNo;
private String upload_No;
private String accept_No;
private String photo_No;
private String name;
private String sexNo;
private String nationNo;
private String sex_No;
private String nation_No;
private String birthday;
private String idNo;
private String id_No;
private String addr1;
private String addr2;
private String addr3;
private String address1;
private String signGovt;
private String expireDate;
private String beginDate;
private String applyReason;
private String statusNo;
private String cardSerial;
private String sign_Govt;
private String expire_Date;
private String begin_Date;
private String apply_Reason;
private String status_No;
@Basic
@Column(name = "UPLOAD_NO", nullable = false, length = 22)
public String getUploadNo() {
return uploadNo;
public String getUpload_No() {
return upload_No;
}
public void setUploadNo(String uploadNo) {
this.uploadNo = uploadNo;
public void setUpload_No(String upload_No) {
this.upload_No = upload_No;
}
@Id
@Column(name = "ACCEPT_NO", nullable = false, length = 12)
public String getAcceptNo() {
return acceptNo;
public String getAccept_No() {
return accept_No;
}
public void setAcceptNo(String acceptNo) {
this.acceptNo = acceptNo;
public void setAccept_No(String accept_No) {
this.accept_No = accept_No;
}
@Basic
@Column(name = "PHOTO_NO", nullable = true, length = 12)
public String getPhotoNo() {
return photoNo;
public String getPhoto_No() {
return photo_No;
}
public void setPhotoNo(String photoNo) {
this.photoNo = photoNo;
public void setPhoto_No(String photo_No) {
this.photo_No = photo_No;
}
@Basic
......@@ -64,25 +63,23 @@ public class ProdCardTEntity {
public void setName(String name) {
this.name = name;
}
@Basic
@Column(name = "SEX_NO", nullable = false, length = 1)
public String getSexNo() {
return sexNo;
public String getSex_No() {
return sex_No;
}
public void setSexNo(String sexNo) {
this.sexNo = sexNo;
public void setSex_No(String sex_No) {
this.sex_No = sex_No;
}
@Basic
@Column(name = "NATION_NO", nullable = false, length = 2)
public String getNationNo() {
return nationNo;
public String getNation_No() {
return nation_No;
}
public void setNationNo(String nationNo) {
this.nationNo = nationNo;
public void setNation_No(String nation_No) {
this.nation_No = nation_No;
}
@Basic
......@@ -94,15 +91,14 @@ public class ProdCardTEntity {
public void setBirthday(String birthday) {
this.birthday = birthday;
}
@Basic
@Column(name = "ID_NO", nullable = false, length = 18)
public String getIdNo() {
return idNo;
public String getId_No() {
return id_No;
}
public void setIdNo(String idNo) {
this.idNo = idNo;
public void setId_No(String id_No) {
this.id_No = id_No;
}
@Basic
......@@ -144,94 +140,78 @@ public class ProdCardTEntity {
public void setAddress1(String address1) {
this.address1 = address1;
}
@Basic
@Column(name = "SIGN_GOVT", nullable = false, length = 45)
public String getSignGovt() {
return signGovt;
public String getSign_Govt() {
return sign_Govt;
}
public void setSignGovt(String signGovt) {
this.signGovt = signGovt;
public void setSign_Govt(String sign_Govt) {
this.sign_Govt = sign_Govt;
}
@Basic
@Column(name = "EXPIRE_DATE", nullable = false, length = 8)
public String getExpireDate() {
return expireDate;
public String getExpire_Date() {
return expire_Date;
}
public void setExpireDate(String expireDate) {
this.expireDate = expireDate;
public void setExpire_Date(String expire_Date) {
this.expire_Date = expire_Date;
}
@Basic
@Column(name = "BEGIN_DATE", nullable = false, length = 8)
public String getBeginDate() {
return beginDate;
public String getBegin_Date() {
return begin_Date;
}
public void setBeginDate(String beginDate) {
this.beginDate = beginDate;
public void setBegin_Date(String begin_Date) {
this.begin_Date = begin_Date;
}
@Basic
@Column(name = "APPLY_REASON", nullable = false, length = 2)
public String getApplyReason() {
return applyReason;
}
public void setApplyReason(String applyReason) {
this.applyReason = applyReason;
public String getApply_Reason() {
return apply_Reason;
}
@Basic
@Column(name = "STATUS_NO", nullable = false, length = 1)
public String getStatusNo() {
return statusNo;
}
public void setStatusNo(String statusNo) {
this.statusNo = statusNo;
public void setApply_Reason(String apply_Reason) {
this.apply_Reason = apply_Reason;
}
@Basic
@Column(name = "CARD_SERIAL", nullable = true, length = 32)
public String getCardSerial() {
return cardSerial;
@Column(name = "STATUS_NO", nullable = true, length = 1)
public String getStatus_No() {
return status_No;
}
public void setCardSerial(String cardSerial) {
this.cardSerial = cardSerial;
public void setStatus_No(String status_No) {
this.status_No = status_No;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ProdCardTEntity that = (ProdCardTEntity) o;
return Objects.equals(uploadNo, that.uploadNo) &&
Objects.equals(acceptNo, that.acceptNo) &&
Objects.equals(photoNo, that.photoNo) &&
Objects.equals(name, that.name) &&
Objects.equals(sexNo, that.sexNo) &&
Objects.equals(nationNo, that.nationNo) &&
Objects.equals(birthday, that.birthday) &&
Objects.equals(idNo, that.idNo) &&
Objects.equals(addr1, that.addr1) &&
Objects.equals(addr2, that.addr2) &&
Objects.equals(addr3, that.addr3) &&
Objects.equals(address1, that.address1) &&
Objects.equals(signGovt, that.signGovt) &&
Objects.equals(expireDate, that.expireDate) &&
Objects.equals(beginDate, that.beginDate) &&
Objects.equals(applyReason, that.applyReason) &&
Objects.equals(statusNo, that.statusNo) &&
Objects.equals(cardSerial, that.cardSerial);
AccCardTEntity that = (AccCardTEntity) o;
return Objects.equals(upload_No, this.upload_No) &&
Objects.equals(accept_No, this.accept_No) &&
Objects.equals(photo_No, this.photo_No) &&
Objects.equals(name, this.name) &&
Objects.equals(sex_No, this.sex_No) &&
Objects.equals(nation_No, this.nation_No) &&
Objects.equals(birthday, this.birthday) &&
Objects.equals(id_No, this.id_No) &&
Objects.equals(addr1, this.addr1) &&
Objects.equals(addr2, this.addr2) &&
Objects.equals(addr3, this.addr3) &&
Objects.equals(address1, this.address1) &&
Objects.equals(sign_Govt, this.sign_Govt) &&
Objects.equals(expire_Date, this.expire_Date) &&
Objects.equals(begin_Date, this.begin_Date) &&
Objects.equals(apply_Reason, this.apply_Reason) &&
Objects.equals(status_No, this.status_No);
}
@Override
public int hashCode() {
return Objects.hash(uploadNo, acceptNo, photoNo, name, sexNo, nationNo, birthday, idNo, addr1, addr2, addr3, address1, signGovt, expireDate, beginDate, applyReason, statusNo, cardSerial);
return Objects.hash(upload_No, accept_No, photo_No, name, sex_No, nation_No, birthday, id_No, addr1, addr2, addr3, address1, sign_Govt, expire_Date, begin_Date, apply_Reason, status_No);
}
}
src/main/java/com/yxproject/start/entity/prod/ProdGroupTEntity.java
View file @ 2b873e47
......@@ -7,247 +7,225 @@ import java.util.Objects;
@Entity
@Table(name = "PROD_GROUP_T", schema = "PROD_DBA", catalog = "")
public class ProdGroupTEntity {
private String groupNo;
private Byte validCount;
private Byte invalidCount;
private Time submitDate;
private String submitCode;
private Time exportDate;
private String exportCode;
private String downloadFlag;
private Byte downloadCount;
private Time downloadDate;
private String ewriteFlag;
private Byte ewriteCount;
private Time ewriteDate;
private String checkFlag;
private Byte checkCount;
private Time checkDate;
private String sendFlag;
private Byte sendCount;
private Time sendDate;
private String moveFlag;
private Byte moveCount;
private Time moveDate;
private String group_No;
private Byte valid_Count;
private Byte invalid_Count;
private Time submit_Date;
private String submit_Code;
private Time export_Date;
private String export_Code;
private String download_Flag;
private Byte download_Count;
private Time download_Date;
private String ewrite_Flag;
private Byte ewrite_Count;
private Time ewrite_Date;
private String check_Flag;
private Byte check_Count;
private Time check_Date;
private String send_Flag;
private Byte send_Count;
private Time send_Date;
private String move_Flag;
private Byte move_Count;
private Time move_Date;
@Id
@Column(name = "GROUP_NO", nullable = false, length = 10)
public String getGroupNo() {
return groupNo;
public String getGroup_No() {
return group_No;
}
public void setGroupNo(String groupNo) {
this.groupNo = groupNo;
public void setGroup_No(String group_No) {
this.group_No = group_No;
}
@Basic
@Column(name = "VALID_COUNT", nullable = true, precision = 0)
public Byte getValidCount() {
return validCount;
public Byte getValid_Count() {
return valid_Count;
}
public void setValidCount(Byte validCount) {
this.validCount = validCount;
public void setValid_Count(Byte valid_Count) {
this.valid_Count = valid_Count;
}
@Basic
@Column(name = "INVALID_COUNT", nullable = true, precision = 0)
public Byte getInvalidCount() {
return invalidCount;
public Byte getInvalid_Count() {
return invalid_Count;
}
public void setInvalidCount(Byte invalidCount) {
this.invalidCount = invalidCount;
public void setInvalid_Count(Byte invalid_Count) {
this.invalid_Count = invalid_Count;
}
@Basic
@Column(name = "SUBMIT_DATE", nullable = true)
public Time getSubmitDate() {
return submitDate;
public Time getSubmit_Date() {
return submit_Date;
}
public void setSubmitDate(Time submitDate) {
this.submitDate = submitDate;
public void setSubmit_Date(Time submit_Date) {
this.submit_Date = submit_Date;
}
@Basic
@Column(name = "SUBMIT_CODE", nullable = true, length = 8)
public String getSubmitCode() {
return submitCode;
public String getSubmit_Code() {
return submit_Code;
}
public void setSubmitCode(String submitCode) {
this.submitCode = submitCode;
public void setSubmit_Code(String submit_Code) {
this.submit_Code = submit_Code;
}
@Basic
@Column(name = "EXPORT_DATE", nullable = true)
public Time getExportDate() {
return exportDate;
public Time getExport_Date() {
return export_Date;
}
public void setExportDate(Time exportDate) {
this.exportDate = exportDate;
public void setExport_Date(Time export_Date) {
this.export_Date = export_Date;
}
@Basic
@Column(name = "EXPORT_CODE", nullable = true, length = 8)
public String getExportCode() {
return exportCode;
public String getExport_Code() {
return export_Code;
}
public void setExportCode(String exportCode) {
this.exportCode = exportCode;
public void setExport_Code(String export_Code) {
this.export_Code = export_Code;
}
@Basic
@Column(name = "DOWNLOAD_FLAG", nullable = true, length = 1)
public String getDownloadFlag() {
return downloadFlag;
public String getDownload_Flag() {
return download_Flag;
}
public void setDownloadFlag(String downloadFlag) {
this.downloadFlag = downloadFlag;
public void setDownload_Flag(String download_Flag) {
this.download_Flag = download_Flag;
}
@Basic
@Column(name = "DOWNLOAD_COUNT", nullable = true, precision = 0)
public Byte getDownloadCount() {
return downloadCount;
public Byte getDownload_Count() {
return download_Count;
}
public void setDownloadCount(Byte downloadCount) {
this.downloadCount = downloadCount;
public void setDownload_Count(Byte download_Count) {
this.download_Count = download_Count;
}
@Basic
@Column(name = "DOWNLOAD_DATE", nullable = true)
public Time getDownloadDate() {
return downloadDate;
public Time getDownload_Date() {
return download_Date;
}
public void setDownloadDate(Time downloadDate) {
this.downloadDate = downloadDate;
public void setDownload_Date(Time download_Date) {
this.download_Date = download_Date;
}
@Basic
@Column(name = "EWRITE_FLAG", nullable = true, length = 1)
public String getEwriteFlag() {
return ewriteFlag;
public String getEwrite_Flag() {
return ewrite_Flag;
}
public void setEwriteFlag(String ewriteFlag) {
this.ewriteFlag = ewriteFlag;
public void setEwrite_Flag(String ewrite_Flag) {
this.ewrite_Flag = ewrite_Flag;
}
@Basic
@Column(name = "EWRITE_COUNT", nullable = true, precision = 0)
public Byte getEwriteCount() {
return ewriteCount;
public Byte getEwrite_Count() {
return ewrite_Count;
}
public void setEwriteCount(Byte ewriteCount) {
this.ewriteCount = ewriteCount;
public void setEwrite_Count(Byte ewrite_Count) {
this.ewrite_Count = ewrite_Count;
}
@Basic
@Column(name = "EWRITE_DATE", nullable = true)
public Time getEwriteDate() {
return ewriteDate;
public Time getEwrite_Date() {
return ewrite_Date;
}
public void setEwriteDate(Time ewriteDate) {
this.ewriteDate = ewriteDate;
public void setEwrite_Date(Time ewrite_Date) {
this.ewrite_Date = ewrite_Date;
}
@Basic
@Column(name = "CHECK_FLAG", nullable = true, length = 1)
public String getCheckFlag() {
return checkFlag;
public String getCheck_Flag() {
return check_Flag;
}
public void setCheckFlag(String checkFlag) {
this.checkFlag = checkFlag;
public void setCheck_Flag(String check_Flag) {
this.check_Flag = check_Flag;
}
@Basic
@Column(name = "CHECK_COUNT", nullable = true, precision = 0)
public Byte getCheckCount() {
return checkCount;
public Byte getCheck_Count() {
return check_Count;
}
public void setCheckCount(Byte checkCount) {
this.checkCount = checkCount;
public void setCheck_Count(Byte check_Count) {
this.check_Count = check_Count;
}
@Basic
@Column(name = "CHECK_DATE", nullable = true)
public Time getCheckDate() {
return checkDate;
public Time getCheck_Date() {
return check_Date;
}
public void setCheckDate(Time checkDate) {
this.checkDate = checkDate;
public void setCheck_Date(Time check_Date) {
this.check_Date = check_Date;
}
@Basic
@Column(name = "SEND_FLAG", nullable = true, length = 1)
public String getSendFlag() {
return sendFlag;
public String getSend_Flag() {
return send_Flag;
}
public void setSendFlag(String sendFlag) {
this.sendFlag = sendFlag;
public void setSend_Flag(String send_Flag) {
this.send_Flag = send_Flag;
}
@Basic
@Column(name = "SEND_COUNT", nullable = true, precision = 0)
public Byte getSendCount() {
return sendCount;
public Byte getSend_Count() {
return send_Count;
}
public void setSendCount(Byte sendCount) {
this.sendCount = sendCount;
public void setSend_Count(Byte send_Count) {
this.send_Count = send_Count;
}
@Basic
@Column(name = "SEND_DATE", nullable = true)
public Time getSendDate() {
return sendDate;
public Time getSend_Date() {
return send_Date;
}
public void setSendDate(Time sendDate) {
this.sendDate = sendDate;
public void setSend_Date(Time send_Date) {
this.send_Date = send_Date;
}
@Basic
@Column(name = "MOVE_FLAG", nullable = true, length = 1)
public String getMoveFlag() {
return moveFlag;
public String getMove_Flag() {
return move_Flag;
}
public void setMoveFlag(String moveFlag) {
this.moveFlag = moveFlag;
public void setMove_Flag(String move_Flag) {
this.move_Flag = move_Flag;
}
@Basic
@Column(name = "MOVE_COUNT", nullable = true, precision = 0)
public Byte getMoveCount() {
return moveCount;
public Byte getMove_Count() {
return move_Count;
}
public void setMoveCount(Byte moveCount) {
this.moveCount = moveCount;
public void setMove_Count(Byte move_Count) {
this.move_Count = move_Count;
}
@Basic
@Column(name = "MOVE_DATE", nullable = true)
public Time getMoveDate() {
return moveDate;
public Time getMove_Date() {
return move_Date;
}
public void setMoveDate(Time moveDate) {
this.moveDate = moveDate;
public void setMove_Date(Time move_Date) {
this.move_Date = move_Date;
}
@Override
......@@ -255,32 +233,32 @@ public class ProdGroupTEntity {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ProdGroupTEntity that = (ProdGroupTEntity) o;
return Objects.equals(groupNo, that.groupNo) &&
Objects.equals(validCount, that.validCount) &&
Objects.equals(invalidCount, that.invalidCount) &&
Objects.equals(submitDate, that.submitDate) &&
Objects.equals(submitCode, that.submitCode) &&
Objects.equals(exportDate, that.exportDate) &&
Objects.equals(exportCode, that.exportCode) &&
Objects.equals(downloadFlag, that.downloadFlag) &&
Objects.equals(downloadCount, that.downloadCount) &&
Objects.equals(downloadDate, that.downloadDate) &&
Objects.equals(ewriteFlag, that.ewriteFlag) &&
Objects.equals(ewriteCount, that.ewriteCount) &&
Objects.equals(ewriteDate, that.ewriteDate) &&
Objects.equals(checkFlag, that.checkFlag) &&
Objects.equals(checkCount, that.checkCount) &&
Objects.equals(checkDate, that.checkDate) &&
Objects.equals(sendFlag, that.sendFlag) &&
Objects.equals(sendCount, that.sendCount) &&
Objects.equals(sendDate, that.sendDate) &&
Objects.equals(moveFlag, that.moveFlag) &&
Objects.equals(moveCount, that.moveCount) &&
Objects.equals(moveDate, that.moveDate);
return Objects.equals(group_No, that.group_No) &&
Objects.equals(valid_Count, that.valid_Count) &&
Objects.equals(invalid_Count, that.invalid_Count) &&
Objects.equals(submit_Date, that.submit_Date) &&
Objects.equals(submit_Code, that.submit_Code) &&
Objects.equals(export_Date, that.export_Date) &&
Objects.equals(export_Code, that.export_Code) &&
Objects.equals(download_Flag, that.download_Flag) &&
Objects.equals(download_Count, that.download_Count) &&
Objects.equals(download_Date, that.download_Date) &&
Objects.equals(ewrite_Flag, that.ewrite_Flag) &&
Objects.equals(ewrite_Count, that.ewrite_Count) &&
Objects.equals(ewrite_Date, that.ewrite_Date) &&
Objects.equals(check_Flag, that.check_Flag) &&
Objects.equals(check_Count, that.check_Count) &&
Objects.equals(check_Date, that.check_Date) &&
Objects.equals(send_Flag, that.send_Flag) &&
Objects.equals(send_Count, that.send_Count) &&
Objects.equals(send_Date, that.send_Date) &&
Objects.equals(move_Flag, that.move_Flag) &&
Objects.equals(move_Count, that.move_Count) &&
Objects.equals(move_Date, that.move_Date);
}
@Override
public int hashCode() {
return Objects.hash(groupNo, validCount, invalidCount, submitDate, submitCode, exportDate, exportCode, downloadFlag, downloadCount, downloadDate, ewriteFlag, ewriteCount, ewriteDate, checkFlag, checkCount, checkDate, sendFlag, sendCount, sendDate, moveFlag, moveCount, moveDate);
return Objects.hash(group_No, valid_Count, invalid_Count, submit_Date, submit_Code, export_Date, export_Code, download_Flag, download_Count, download_Date, ewrite_Flag, ewrite_Count, ewrite_Date, check_Flag, check_Count, check_Date, send_Flag, send_Count, send_Date, move_Flag, move_Count, move_Date);
}
}
src/main/java/com/yxproject/start/entity/prod/ProdTraceTEntity.java
View file @ 2b873e47
......@@ -7,172 +7,158 @@ import java.util.Objects;
@Entity
@Table(name = "PROD_TRACE_T", schema = "PROD_DBA", catalog = "")
public class ProdTraceTEntity {
private String acceptNo;
private String photoerNo;
private Time photoDate;
private String exportNo;
private Time exportDate;
private String downloadNo;
private Time downloadDate;
private String electricWriterNo;
private Time electricWriteDate;
private String checkerNo;
private Time checkDate;
private String moverNo;
private Time moveDate;
private String accept_No;
private String photoer_No;
private Time photo_Date;
private String export_No;
private Time export_Date;
private String download_No;
private Time download_Date;
private String electric_Writer_No;
private Time electric_Write_Date;
private String checker_No;
private Time check_Date;
private String mover_No;
private Time move_Date;
@Id
@Column(name = "ACCEPT_NO", nullable = false, length = 12)
public String getAcceptNo() {
return acceptNo;
public String getAccept_No() {
return accept_No;
}
public void setAcceptNo(String acceptNo) {
this.acceptNo = acceptNo;
public void setAccept_No(String accept_No) {
this.accept_No = accept_No;
}
@Basic
@Column(name = "PHOTOER_NO", nullable = true, length = 8)
public String getPhotoerNo() {
return photoerNo;
public String getPhotoer_No() {
return photoer_No;
}
public void setPhotoerNo(String photoerNo) {
this.photoerNo = photoerNo;
public void setPhotoer_No(String photoer_No) {
this.photoer_No = photoer_No;
}
@Basic
@Column(name = "PHOTO_DATE", nullable = true)
public Time getPhotoDate() {
return photoDate;
public Time getPhoto_Date() {
return photo_Date;
}
public void setPhotoDate(Time photoDate) {
this.photoDate = photoDate;
public void setPhoto_Date(Time photo_Date) {
this.photo_Date = photo_Date;
}
@Basic
@Column(name = "EXPORT_NO", nullable = true, length = 8)
public String getExportNo() {
return exportNo;
public String getExport_No() {
return export_No;
}
public void setExportNo(String exportNo) {
this.exportNo = exportNo;
public void setExport_No(String export_No) {
this.export_No = export_No;
}
@Basic
@Column(name = "EXPORT_DATE", nullable = true)
public Time getExportDate() {
return exportDate;
public Time getExport_Date() {
return export_Date;
}
public void setExportDate(Time exportDate) {
this.exportDate = exportDate;
public void setExport_Date(Time export_Date) {
this.export_Date = export_Date;
}
@Basic
@Column(name = "DOWNLOAD_NO", nullable = true, length = 8)
public String getDownloadNo() {
return downloadNo;
public String getDownload_No() {
return download_No;
}
public void setDownloadNo(String downloadNo) {
this.downloadNo = downloadNo;
public void setDownload_No(String download_No) {
this.download_No = download_No;
}
@Basic
@Column(name = "DOWNLOAD_DATE", nullable = true)
public Time getDownloadDate() {
return downloadDate;
public Time getDownload_Date() {
return download_Date;
}
public void setDownloadDate(Time downloadDate) {
this.downloadDate = downloadDate;
public void setDownload_Date(Time download_Date) {
this.download_Date = download_Date;
}
@Basic
@Column(name = "ELECTRIC_WRITER_NO", nullable = true, length = 8)
public String getElectricWriterNo() {
return electricWriterNo;
public String getElectric_Writer_No() {
return electric_Writer_No;
}
public void setElectricWriterNo(String electricWriterNo) {
this.electricWriterNo = electricWriterNo;
public void setElectric_Writer_No(String electric_Writer_No) {
this.electric_Writer_No = electric_Writer_No;
}
@Basic
@Column(name = "ELECTRIC_WRITE_DATE", nullable = true)
public Time getElectricWriteDate() {
return electricWriteDate;
public Time getElectric_Write_Date() {
return electric_Write_Date;
}
public void setElectricWriteDate(Time electricWriteDate) {
this.electricWriteDate = electricWriteDate;
public void setElectric_Write_Date(Time electric_Write_Date) {
this.electric_Write_Date = electric_Write_Date;
}
@Basic
@Column(name = "CHECKER_NO", nullable = true, length = 8)
public String getCheckerNo() {
return checkerNo;
public String getChecker_No() {
return checker_No;
}
public void setCheckerNo(String checkerNo) {
this.checkerNo = checkerNo;
public void setChecker_No(String checker_No) {
this.checker_No = checker_No;
}
@Basic
@Column(name = "CHECK_DATE", nullable = true)
public Time getCheckDate() {
return checkDate;
public Time getCheck_Date() {
return check_Date;
}
public void setCheckDate(Time checkDate) {
this.checkDate = checkDate;
public void setCheck_Date(Time check_Date) {
this.check_Date = check_Date;
}
@Basic
@Column(name = "MOVER_NO", nullable = true, length = 8)
public String getMoverNo() {
return moverNo;
public String getMover_No() {
return mover_No;
}
public void setMoverNo(String moverNo) {
this.moverNo = moverNo;
public void setMover_No(String mover_No) {
this.mover_No = mover_No;
}
@Basic
@Column(name = "MOVE_DATE", nullable = true)
public Time getMoveDate() {
return moveDate;
public Time getMove_Date() {
return move_Date;
}
public void setMoveDate(Time moveDate) {
this.moveDate = moveDate;
public void setMove_Date(Time move_Date) {
this.move_Date = move_Date;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ProdTraceTEntity that = (ProdTraceTEntity) o;
return Objects.equals(acceptNo, that.acceptNo) &&
Objects.equals(photoerNo, that.photoerNo) &&
Objects.equals(photoDate, that.photoDate) &&
Objects.equals(exportNo, that.exportNo) &&
Objects.equals(exportDate, that.exportDate) &&
Objects.equals(downloadNo, that.downloadNo) &&
Objects.equals(downloadDate, that.downloadDate) &&
Objects.equals(electricWriterNo, that.electricWriterNo) &&
Objects.equals(electricWriteDate, that.electricWriteDate) &&
Objects.equals(checkerNo, that.checkerNo) &&
Objects.equals(checkDate, that.checkDate) &&
Objects.equals(moverNo, that.moverNo) &&
Objects.equals(moveDate, that.moveDate);
return Objects.equals(accept_No, that.accept_No) &&
Objects.equals(photoer_No, that.photoer_No) &&
Objects.equals(photo_Date, that.photo_Date) &&
Objects.equals(export_No, that.export_No) &&
Objects.equals(export_Date, that.export_Date) &&
Objects.equals(download_No, that.download_No) &&
Objects.equals(download_Date, that.download_Date) &&
Objects.equals(electric_Writer_No, that.electric_Writer_No) &&
Objects.equals(electric_Write_Date, that.electric_Write_Date) &&
Objects.equals(checker_No, that.checker_No) &&
Objects.equals(check_Date, that.check_Date) &&
Objects.equals(mover_No, that.mover_No) &&
Objects.equals(move_Date, that.move_Date);
}
@Override
public int hashCode() {
return Objects.hash(acceptNo, photoerNo, photoDate, exportNo, exportDate, downloadNo, downloadDate, electricWriterNo, electricWriteDate, checkerNo, checkDate, moverNo, moveDate);
return Objects.hash(accept_No, photoer_No, photo_Date, export_No, export_Date, download_No, download_Date, electric_Writer_No, electric_Write_Date, checker_No, check_Date, mover_No, move_Date);
}
}
src/main/java/com/yxproject/start/mapper/AccCardTMapper.java 0 → 100644
View file @ 2b873e47
package com.yxproject.start.mapper;
import com.yxproject.start.entity.accu.AccCardTEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
/**
* Created by zhangyusheng on 2018/10/23 10:34
*/
@Mapper
public interface AccCardTMapper {
public List<AccCardTEntity> findAccCardTEntityByCardIdOrAcceptNo(String acceptNo);
public List<Map<String,Object>> findAccGroupTEntityByCardIdOrAcceptNo(String acceptNo);
public List<Map<String,Object>> findAccGroupTEntityByCardIdOrDealDate(String dealDate);
}
src/main/java/com/yxproject/start/mapper/AccGroupRelationTMapper.java 0 → 100644
View file @ 2b873e47
package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper;
/**
* Created by zhangyusheng on 2018/10/23 10:35
*/
@Mapper
public interface AccGroupRelationTMapper {
}
src/main/java/com/yxproject/start/mapper/AccGroupTMapper.java 0 → 100644
View file @ 2b873e47
package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper;
/**
* Created by zhangyusheng on 2018/10/23 10:36
*/
@Mapper
public interface AccGroupTMapper {
}
src/main/java/com/yxproject/start/mapper/GroupinfoMapper.java 0 → 100644
View file @ 2b873e47
package com.yxproject.start.mapper;
import com.yxproject.start.entity.GroupinfoEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* Created by zhangyusheng on 2018/10/13 9:36
*/
@Mapper
public interface GroupinfoMapper {
public int insertGroupinfoEntity(GroupinfoEntity groupinfoEntity);
public List<GroupinfoEntity> findGroupinfoEntityByAcceptNo(String acceptNo);
public int updateGroupinfoEntity(GroupinfoEntity groupinfoEntity);
}
src/main/java/com/yxproject/start/mapper/ProdApplyInfoMapper.java 0 → 100644
View file @ 2b873e47
package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper;
/**
* Created by zhangyusheng on 2018/10/23 10:42
*/
@Mapper
public interface ProdApplyInfoMapper {
}
src/main/java/com/yxproject/start/mapper/ProdCardTMapper.java 0 → 100644
View file @ 2b873e47
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;
/**
* Created by zhangyusheng on 2018/10/23 10:43
*/
@Mapper
public interface ProdCardTMapper {
@SelectProvider(type=com.yxproject.start.SqlProvider.SqlProvider.class,method="findCardInfoByCardIDOrAcceptNoAtPRODSql")
List<ProdCardTEntity> findCardInfo(String card);
}
src/main/java/com/yxproject/start/mapper/ProdGroupTMapper.java 0 → 100644
View file @ 2b873e47
package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper;
/**
* Created by zhangyusheng on 2018/10/23 10:43
*/
@Mapper
public interface ProdGroupTMapper {
}
src/main/java/com/yxproject/start/mapper/ProdTraceTMapper.java 0 → 100644
View file @ 2b873e47
package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper;
/**
* Created by zhangyusheng on 2018/10/23 10:44
*/
@Mapper
public interface ProdTraceTMapper {
}
src/main/java/com/yxproject/start/mapper/ProductionTaskListMapper.java
View file @ 2b873e47
package com.yxproject.start.mapper;
import com.yxproject.start.entity.ProductionTaskListEntity;
import net.sf.json.JSONArray;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.springframework.data.repository.query.Param;
import org.apache.ibatis.annotations.UpdateProvider;
import java.util.List;
/**
* @author Administratorid
* Created by zhangyusheng on 2018/10/13 9:36
*/
@Mapper
public interface ProductionTaskListMapper {
// @Select("select PRODUCTION_TASK_LIST_ID,MAKE_TYPE,CITYCODE from PRODUCTION_TASK_LIST where PRODUCTION_TASK_LIST_ID=#{id}")
public List<ProductionTaskListEntity> findProductionTaskListEntity(String id);
// @Insert("Insert into DAHAI.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) values ('20181016004',0,null,'410100',null,'20181016',null,null,null,null,null,null,null,null,null,null,null) ")
public int insertProductionTaskListEntity(ProductionTaskListEntity productionTaskListEntity);
public int findProductionTaskSeqNexvalue();
public int updateProductionTask(ProductionTaskListEntity productionTaskListEntity);
public List<ProductionTaskListEntity> findProductionTaskListEntityByAcceptNo(String acceptNo);
}
src/main/java/com/yxproject/start/mapper/UtilMapper.java
View file @ 2b873e47
......@@ -13,4 +13,8 @@ public interface UtilMapper {
* 查询任务单序列值
*/
public int findProductionTaskListSequenceNextValue();
/**
* 查询组号信息序列值
*/
public int findGroupInfoSequenceNextValue();
}
src/main/java/com/yxproject/start/service/ProductionTaskListService.java
View file @ 2b873e47
package com.yxproject.start.service;
import com.yxproject.start.entity.GroupinfoEntity;
import com.yxproject.start.entity.ProductionTaskListEntity;
import java.util.List;
......@@ -9,7 +10,10 @@ public interface ProductionTaskListService {
public List<ProductionTaskListEntity> findProductionTaskListEntityByID(String id);
public int updateProductionTask(ProductionTaskListEntity map);
public int addProductionTaskListEntity(ProductionTaskListEntity productionTaskListEntity);
public int addProductionTaskListEntity(ProductionTaskListEntity productionTaskListEntity, List<GroupinfoEntity> groupinfoEntities);
public int addQuickCyclesheetInfo(String acceptNo);
public List<Object> findCardInfoByCardIDOrAcceptNo(String cardInfo);
public List<Object> findAccuProductionInfo(String importDate);
}
src/main/java/com/yxproject/start/service/UtilService.java
View file @ 2b873e47
......@@ -5,6 +5,7 @@ public interface UtilService {
public int findProductionTaskListSequenceNextValue();
public int findGroupInfoSequenceNextValue();
}
src/main/java/com/yxproject/start/service/impl/ProductionTaskListServiceImpl.java
View file @ 2b873e47
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.GroupinfoEntity;
import com.yxproject.start.entity.ProductionTaskListEntity;
import com.yxproject.start.mapper.ProductionTaskListMapper;
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.JSONArray;
import net.sf.json.JSONObject;
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;
......@@ -19,20 +26,280 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService
@Autowired
public ProductionTaskListMapper productionTaskListMapper;
@Autowired
public GroupinfoMapper groupinfoMapper;
@Autowired
public UtilMapper utilMapper;
@Autowired
public AccCardTMapper accCardTMapper;
@Autowired
public ProdCardTMapper prodCardTMapper;
/**
* 查询任务单
* 通过任务单ID
* @param id
* @return
*/
@Override
public List<ProductionTaskListEntity> findProductionTaskListEntityByID(String id) {
return productionTaskListMapper.findProductionTaskListEntity(id);
}
/**
* 更新任务单信息
* 通过新的任务单信息
* @param productionTaskListEntity
* @return
*/
@Override
public int updateProductionTask(ProductionTaskListEntity map) {
public int updateProductionTask(ProductionTaskListEntity productionTaskListEntity) {
return productionTaskListMapper.updateProductionTask(productionTaskListEntity);
}
/**
* 生成任务单并保存组号列表
*
* @param productionTaskListEntity 任务单详情
* @param groupinfoEntities 组号列表
* @return
*/
@Override
@Transactional(rollbackFor=Exception.class)
public int addProductionTaskListEntity(ProductionTaskListEntity productionTaskListEntity, List<GroupinfoEntity> groupinfoEntities) {
int production_task_list_seq = utilMapper.findProductionTaskListSequenceNextValue();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
productionTaskListEntity.setProduction_TaskList_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);
}
return productionTaskListMapper.updateProductionTask(map);
return 1;
}
/**
* 查询证件信息（搜索框）
* 包括受理库、制证库的证件信息，以及该证件所在任务单的详细情况
* @param cardInfo
* @return
*/
@Override
public int addProductionTaskListEntity(ProductionTaskListEntity productionTaskListEntity) {
public List<Object> findCardInfoByCardIDOrAcceptNo(String cardInfo) {
List<Object> list= new ArrayList<>();
String accept_no ="";
List<AccCardTEntity> accCardTEntityByCardIdOrAcceptNo = accCardTMapper.findAccCardTEntityByCardIdOrAcceptNo(cardInfo);
if (accCardTEntityByCardIdOrAcceptNo.size()!=0){
list.addAll(accCardTEntityByCardIdOrAcceptNo);
for (AccCardTEntity accCardTEntity :accCardTEntityByCardIdOrAcceptNo) {
accept_no=accCardTEntity.getAccept_No();
}
}
List<ProdCardTEntity> prodCardTEntityByCardIdOrAcceptNo = prodCardTMapper.findCardInfo(cardInfo);
if (prodCardTEntityByCardIdOrAcceptNo.size()!=0){
list.addAll(prodCardTEntityByCardIdOrAcceptNo);
for (ProdCardTEntity prodCardTEntity:prodCardTEntityByCardIdOrAcceptNo) {
accept_no = prodCardTEntity.getAccept_No() ;
}
}
List<Map<String, Object>> accGroupTEntityByCardIdOrAcceptNo = accCardTMapper.findAccGroupTEntityByCardIdOrAcceptNo(accept_no);
System.out.println(accGroupTEntityByCardIdOrAcceptNo);
List<ProductionTaskListEntity> productionTaskListEntityByAcceptNo = productionTaskListMapper.findProductionTaskListEntityByAcceptNo(accept_no);
list.addAll(productionTaskListEntityByAcceptNo);
return list;
}
/**
* 添加快证
* 包含已经下发的任务单、没有下发的任务单
* @param cardInfo
* @return
*/
@Override
@Transactional(rollbackFor=Exception.class)
public int addQuickCyclesheetInfo(String cardInfo) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
/**
* 查询证件的受理号
*/
String accept_no ="";
List<AccCardTEntity> accCardTEntityByCardIdOrAcceptNo = accCardTMapper.findAccCardTEntityByCardIdOrAcceptNo(cardInfo);
if (accCardTEntityByCardIdOrAcceptNo.size()!=0){
for (AccCardTEntity accCardTEntity :accCardTEntityByCardIdOrAcceptNo) {
accept_no=accCardTEntity.getAccept_No();
}
}
List<ProdCardTEntity> prodCardTEntityByCardIdOrAcceptNo = prodCardTMapper.findCardInfo(cardInfo);
if (prodCardTEntityByCardIdOrAcceptNo.size()!=0){
for (ProdCardTEntity prodCardTEntity:prodCardTEntityByCardIdOrAcceptNo) {
accept_no = prodCardTEntity.getAccept_No() ;
}
}
List<GroupinfoEntity> groupinfoEntityByAcceptNo = groupinfoMapper.findGroupinfoEntityByAcceptNo(accept_no);
/**
* 没有下发任务单的情况
* 即 在组号列表中没有没有该受理组号
*/
if (groupinfoEntityByAcceptNo.size()==0){
List<Map<String, Object>> entity = accCardTMapper.findAccGroupTEntityByCardIdOrAcceptNo(accept_no);
for (Map<String,Object> map :entity){
Object group_no = map.get("GROUP_NO");
Object valid_count = map.get("VALID_COUNT");
Object invalid_count = map.get("INVALID_COUNT");
Object original_no = map.get("ORIGINAL_NO");
/**
* 生成原来的任务单 但不下发
*/
ProductionTaskListEntity productionTaskListEntity = new ProductionTaskListEntity();
int production_task_list_seq = utilMapper.findProductionTaskListSequenceNextValue();
productionTaskListEntity.setProduction_TaskList_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);
/**
* 生成原来任务单的组号列表
* 原组号和快证组号
*/
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()));
groupinfoMapper.insertGroupinfoEntity(groupinfoEntity);
int groupInfoSequenceValue2 = utilMapper.findGroupInfoSequenceNextValue();
GroupinfoEntity groupinfoEntity2 = new GroupinfoEntity();
groupinfoEntity2.setGroupid(simpleDateFormat.format(new Date())+groupInfoSequenceValue2);
groupinfoEntity2.setCyclesheetid(simpleDateFormat.format(new Date())+production_task_list_seq);
groupinfoEntity2.setGroupno(accept_no);
groupinfoEntity2.setGrouptype((long)1);
groupinfoEntity2.setInvalid_Count((long)0);
groupinfoEntity2.setValid_Count((long)-1);
groupinfoMapper.insertGroupinfoEntity(groupinfoEntity2);
/**
* 生成快证任务单并下发
*/
ProductionTaskListEntity productionTaskListEntityQ = new ProductionTaskListEntity();
int production_task_list_seqQ = utilMapper.findProductionTaskListSequenceNextValue();
productionTaskListEntityQ.setProduction_TaskList_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);
/**
* 生成快证任务单的组号列表
* 快证组号
*/
int groupInfoSequenceValueQ = utilMapper.findGroupInfoSequenceNextValue();
GroupinfoEntity groupinfoEntityQ = new GroupinfoEntity();
groupinfoEntityQ.setGroupid(simpleDateFormat.format(new Date())+groupInfoSequenceValueQ);
groupinfoEntityQ.setCyclesheetid(simpleDateFormat.format(new Date())+production_task_list_seqQ);
groupinfoEntityQ.setGroupno(accept_no);
groupinfoEntityQ.setGrouptype((long)1);
groupinfoEntityQ.setInvalid_Count((long)0);
groupinfoEntityQ.setValid_Count((long)1);
groupinfoMapper.insertGroupinfoEntity(groupinfoEntityQ);
}
}else if (groupinfoEntityByAcceptNo.size()==1){
/**
* 下发任务单 但没有产生余证的情况
* 即 在组号列表中只有一个受理组号
*/
List<ProductionTaskListEntity> productionTaskListEntity = productionTaskListMapper.findProductionTaskListEntity(groupinfoEntityByAcceptNo.get(0).getCyclesheetid());
/**
* 从原来的任务单中减去快证
* 即从原来任务单组号列表中插入一条-1的组号
*/
int groupInfoSequenceValue2 = utilMapper.findGroupInfoSequenceNextValue();
GroupinfoEntity groupinfoEntity2 = new GroupinfoEntity();
groupinfoEntity2.setGroupid(simpleDateFormat.format(new Date())+groupInfoSequenceValue2);
groupinfoEntity2.setCyclesheetid(productionTaskListEntity.get(0).getProduction_TaskList_Id());
groupinfoEntity2.setGroupno(accept_no);
groupinfoEntity2.setGrouptype((long)1);
groupinfoEntity2.setInvalid_Count((long)0);
groupinfoEntity2.setValid_Count((long)-1);
groupinfoMapper.insertGroupinfoEntity(groupinfoEntity2);
/**
* 生成快证任务单并下发
*/
ProductionTaskListEntity productionTaskListEntityQ = new ProductionTaskListEntity();
int production_task_list_seqQ = utilMapper.findProductionTaskListSequenceNextValue();
productionTaskListEntityQ.setProduction_TaskList_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);
/**
* 生成快证任务单的组号列表
* 快证组号
*/
int groupInfoSequenceValueQ = utilMapper.findGroupInfoSequenceNextValue();
GroupinfoEntity groupinfoEntityQ = new GroupinfoEntity();
groupinfoEntityQ.setGroupid(simpleDateFormat.format(new Date())+groupInfoSequenceValueQ);
groupinfoEntityQ.setCyclesheetid(simpleDateFormat.format(new Date())+production_task_list_seqQ);
groupinfoEntityQ.setGroupno(accept_no);
groupinfoEntityQ.setGrouptype((long)1);
groupinfoEntityQ.setInvalid_Count((long)0);
groupinfoEntityQ.setValid_Count((long)1);
groupinfoMapper.insertGroupinfoEntity(groupinfoEntityQ);
}else {
/**
* 下发任务单 存在产生余证的情况
*即更新组号列表的组号类型 以及更新余证任务单的制证类型和原制证类型
*/
List<GroupinfoEntity> groupinfoEntities = groupinfoMapper.findGroupinfoEntityByAcceptNo(accept_no);
for (GroupinfoEntity groupinfoEntity:groupinfoEntities){
/*
找到余证任务单 并更新制证类型和原制证类型
*/
if (accept_no.equals(groupinfoEntity.getGroupno()) &&groupinfoEntity.getValid_Count()==1){
/**
* 找到余证任务单
*/
List<ProductionTaskListEntity> productionTaskListEntities = productionTaskListMapper.findProductionTaskListEntity(groupinfoEntity.getCyclesheetid());
for (ProductionTaskListEntity productionTaskListEntity:productionTaskListEntities){
productionTaskListEntity.setOld_Make_Type(productionTaskListEntity.getMake_Type());
productionTaskListEntity.setMake_Type((long)1);
productionTaskListMapper.updateProductionTask(productionTaskListEntity);
}
groupinfoEntity.setGrouptype((long)1);
groupinfoMapper.updateGroupinfoEntity(groupinfoEntity);
}else if (accept_no.equals(groupinfoEntity.getGroupno())){
groupinfoEntity.setGrouptype((long)1);
groupinfoMapper.updateGroupinfoEntity(groupinfoEntity);
}
}
return productionTaskListMapper.insertProductionTaskListEntity(productionTaskListEntity);
}
return 0;
}
/**
* 查询受理库制证信息
* 按查询处理时间
* @param importDate
* @return
*/
@Override
@Transactional(rollbackFor=Exception.class)
public List<Object> findAccuProductionInfo(String importDate) {
return new ArrayList<>();
}
}
src/main/java/com/yxproject/start/service/impl/UtilServiceImpl.java
View file @ 2b873e47
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.ProductionTaskListEntity;
import com.yxproject.start.mapper.ProductionTaskListMapper;
import com.yxproject.start.mapper.UtilMapper;
import com.yxproject.start.service.ProductionTaskListService;
import com.yxproject.start.service.UtilService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author Administrator
*/
......@@ -22,4 +17,9 @@ public class UtilServiceImpl implements UtilService {
return utilMapper.findProductionTaskListSequenceNextValue();
}
@Override
public int findGroupInfoSequenceNextValue() {
return utilMapper.findGroupInfoSequenceNextValue();
}
}
src/main/resources/mapper/AccCardTMapper.xml 0 → 100644
View file @ 2b873e47
<?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.AccCardTMapper">
<resultMap id="AccCardTMapper" type="com.yxproject.start.entity.accu.AccCardTEntity">
<id column="ACCEPT_NO" property="acceptNo" jdbcType="VARCHAR"/>
<result column="UPLOAD_NO" property="uploadNo" jdbcType="VARCHAR"/>
<result column="PHOTO_NO" property="photoNo" jdbcType="CHAR"/>
<result column="NAME" property="name" jdbcType="VARCHAR"/>
<result column="SEX_NO" property="sexNo" jdbcType="CHAR"/>
<result column="NATION_NO" property="nationNo" jdbcType="CHAR"/>
<result column="BIRTHDAY" property="birthday" jdbcType="CHAR"/>
<result column="ID_NO" property="idNo" jdbcType="VARCHAR"/>
<result column="ADDR1" property="addr1" jdbcType="VARCHAR"/>
<result column="ADDR2" property="addr2" jdbcType="VARCHAR"/>
<result column="ADDR3" property="addr3" jdbcType="VARCHAR"/>
<result column="ADDRESS1" property="address1" jdbcType="VARCHAR"/>
<result column="SIGN_GOVT" property="signGovt" jdbcType="VARCHAR"/>
<result column="EXPIRE_DATE" property="expireDate" jdbcType="CHAR"/>
<result column="BEGIN_DATE" property="beginDate" jdbcType="CHAR"/>
<result column="APPLY_REASON" property="applyReason" jdbcType="CHAR"/>
<result column="STATUS_NO" property="statusNo" jdbcType="CHAR"/>
</resultMap>
<select id="findAccCardTEntityByCardIdOrAcceptNo" resultType="com.yxproject.start.entity.accu.AccCardTEntity" parameterType="String">
select * from acc_card_t@ACCU_DBLINK WHERE ACCEPT_NO LIKE #{acceptNo} or ID_NO = #{acceptNo}
</select>
<select id="findAccGroupTEntityByCardIdOrDealDate" resultType="java.util.HashMap" parameterType="String">
SELECT ACC_GROUP_T.GROUP_NO,ACC_GROUP_RELATION_T.DEAL_DATE,ACC_GROUP_T.DEAL_FLAG,substr(ACC_GROUP_RELATION_T.ORIGINAL_NO,0,6),CITYINFO.CITYNAME,decode(substr(ACC_GROUP_RELATION_T.ORIGINAL_NO,0,6),'419900',6,substr(ACC_GROUP_RELATION_T.ORIGINAL_NO,21,1)),MAKETYPE_DIC.CARDTYPE,ACC_GROUP_T.INVALID_COUNT,ACC_GROUP_T.VALID_COUNT
FROM ACC_GROUP_T@ACCU_DBLINK LEFT join ACC_GROUP_RELATION_T@ACCU_DBLINK on ACC_GROUP_T.GROUP_NO = ACC_GROUP_RELATION_T.GROUP_NO
left join CITYINFO on CITYINFO.CITYCODE = substr(ACC_GROUP_RELATION_T.ORIGINAL_NO,0,6)
left join MAKETYPE_DIC on MAKETYPE_DIC.TYPENUM = decode(substr(ACC_GROUP_RELATION_T.ORIGINAL_NO,0,6),'419900',6,substr(ACC_GROUP_RELATION_T.ORIGINAL_NO,21,1))
where ACC_GROUP_RELATION_T.DEAL_DATE =#(dealDate)
and ACC_GROUP_T.group_no not in (select groupinfo.groupno from groupinfo)
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/GroupinfoMapper.xml 0 → 100644
View file @ 2b873e47
<?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"/>
<result column="GROUPTYPE" property="grouptype" jdbcType="NUMERIC"/>
<result column="VAILD_COUNT" property="vaildCount" jdbcType="NUMERIC"/>
<result column="INVALID_COUNT" property="invalidCount" jdbcType="NUMERIC"/>
</resultMap>
<select id="findGroupinfoEntityListByProductionTaskListId" resultType="com.yxproject.start.entity.GroupinfoEntity" parameterType="String">
select * from GROUPINFO where cyclesheetid like #{id}
</select>
<insert id="insertGroupinfoEntity" parameterType="com.yxproject.start.entity.GroupinfoEntity">
Insert into GROUPINFO (GROUPID,GROUPNO,CYCLESHEETID,GROUPTYPE,VAILD_COUNT,INVALID_COUNT) values
(#{groupid}
<if test=" groupno!= null">,#{groupno}</if>
<if test="groupno == null">,null </if>
<if test="grouptype != null">,#{grouptype}</if>
<if test="grouptype == null">,null </if>
<if test="cyclesheetid != null">,#{cyclesheetid}</if>
<if test="cyclesheetid == null">,null </if>
<if test="grouptype != null">,#{grouptype}</if>
<if test="grouptype == null">,null </if>
<if test="vaildCount != null">,#{vaildCount}</if>
<if test="vaildCount == null">,null </if>
<if test="invalidCount != null">,#{invalidCount}</if>
<if test="invalidCount == null">,null </if>)
</insert>
<select id="findGroupinfoEntityByAcceptNo" resultType="com.yxproject.start.entity.GroupinfoEntity" parameterType="String">
select * from GROUPINFO where GROUPNO =#{acceptNo} or GROUPNO =substr(#{acceptNo},0,8)
</select>
<update id="updateGroupinfoEntity" parameterType="com.yxproject.start.entity.GroupinfoEntity">
update GROUPINFO set GROUPID=#{groupid}
<if test="groupno != null">,groupno =#{groupno}</if>
<if test="makeType != null">,MAKE_TYPE =#{makeType}</if>
<if test="cyclesheetid != null">,cyclesheetid =#{cyclesheetid}</if>
<if test="grouptype != null">,grouptype =#{grouptype}</if>
<if test="valid_Count != null">,valid_Count =#{valid_Count}</if>
<if test="invalid_Count != null">,invalid_Count =#{invalid_Count}</if>
where GROUPID=#{groupid}
</update>
<select id="findGroupinfoEntityByAcceptNo" resultType="java.util.HashMap" parameterType="String">
select * from GROUPINFO where GROUPNO =#{acceptNo} or GROUPNO =substr(#{acceptNo},0,8)
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/ProductionTaskListMapper.xml
View file @ 2b873e47
......@@ -28,7 +28,7 @@
<insert id="insertProductionTaskListEntity" parameterType="com.yxproject.start.entity.ProductionTaskListEntity">
Insert into DAHAI.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)
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)
values (#{productionTaskListId}
<if test="makeType != null">,#{makeType}</if>
<if test="makeType == null">,null </if>
......@@ -65,7 +65,7 @@
</insert>
<update id="updateProductionTask" parameterType="com.yxproject.start.entity.ProductionTaskListEntity">
update DAHAI.PRODUCTION_TASK_LIST set PRODUCTION_TASK_LIST_ID=#{productionTaskListId}
update PRODUCTION_TASK_LIST set PRODUCTION_TASK_LIST_ID=#{productionTaskListId}
<if test="oldMakeType != null">,OLD_MAKE_TYPE =#{oldMakeType}</if>
<if test="makeType != null">,MAKE_TYPE =#{makeType}</if>
<if test="citycode != null">,CITYCODE =#{citycode}</if>
......@@ -85,4 +85,9 @@
where PRODUCTION_TASK_LIST_ID=#{productionTaskListId}
</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>
</mapper>
\ No newline at end of file
src/main/resources/mapper/SysPermissionMapper.xml
View file @ 2b873e47
......@@ -12,7 +12,7 @@
<result column="available" property="available"/>
</resultMap>
<insert id="addPermissionByMap" parameterType="com.yxproject.start.entity.SysPermission">
Insert into DAHAI.SYS_PERMISSION (ID,AVAILABLE,NAME,PARENT_ID,PARENT_IDS,PERMISSION,RESOURCE_TYPE,URL) values (PERMISSION_seq.nextval,0,#{name},#{parentId},#{parentIds},#{permission},#{resourceType},#{url})
</insert>
<!--<insert id="addPermissionByMap" parameterType="com.yxproject.start.entity.SysPermission">-->
<!--Insert into DAHAI.SYS_PERMISSION (ID,AVAILABLE,NAME,PARENT_ID,PARENT_IDS,PERMISSION,RESOURCE_TYPE,URL) values (PERMISSION_seq.nextval,0,#{name},#{parentId},#{parentIds},#{permission},#{resourceType},#{url})-->
<!--</insert>-->
</mapper>
\ No newline at end of file
src/main/resources/mapper/SystemUserMapper.xml
View file @ 2b873e47
......@@ -36,13 +36,13 @@
insert into USER_INFO (`u_id`,`username`,`name`,`password`,`salt`,`state`) VALUES (USER_INFO_seq.nextval, 'admin', '管理员', 'd3c59d25033dbf980d29554025c23a75', '8d78869f470951332959580424d4bf4f', 0)
</insert>
<update id = "delUserInfo" parameterType = "int" >
update user_info set STATE = 1 where u_id =#{uId}
</update>
<!--<update id = "delUserInfo" parameterType = "int" >-->
<!--update user_info set STATE = 1 where u_id =#{uId}-->
<!--</update>-->
<update id = "updateUserInfo" parameterType = "map" >
update user_info set username =#{username},name =#{name},password =#{password} where u_id =#{uId}
</update>
<!--<update id = "updateUserInfo" parameterType = "map" >-->
<!--update user_info set username =#{username},name =#{name},password =#{password} where u_id =#{uId}-->
<!--</update>-->
<!--<select id="findUserByUsername" resultMap="UserRoleMenuMap" parameterType="string">-->
<!--select user_info.uid,user_info.username,user_info.password,user_info.name,sys_role.id as rid,sys_role.role,sys_role.description,-->
......
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