Skip to content

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

数据核验保存任务单 

更新任务单详情
查询多库证件信息
添加快证制证流程
parent 02d3c3e0
Show whitespace changes
Inline Side-by-side
Showing with 1206 additions and 855 deletions
pom.xml
View file @ 2b873e47
...@@ -102,6 +102,14 @@ ...@@ -102,6 +102,14 @@
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
</dependency>
</dependencies> </dependencies>
<build> <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; package com.yxproject.start.api;
import com.yxproject.start.entity.ProductionTaskListEntity; import com.yxproject.start.entity.*;
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.service.ProductionTaskListService; import com.yxproject.start.service.ProductionTaskListService;
import com.yxproject.start.service.UtilService; import com.yxproject.start.service.SysPermissionService;
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.SysRoleService; import com.yxproject.start.service.SysRoleService;
import com.yxproject.start.service.UserInfoService; 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.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.IncorrectCredentialsException; import org.apache.shiro.authc.IncorrectCredentialsException;
...@@ -22,21 +16,17 @@ import org.apache.shiro.subject.Subject; ...@@ -22,21 +16,17 @@ import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; 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.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* @author Administrator * @author Administrator
*/ */
...@@ -44,8 +34,7 @@ import java.util.Map; ...@@ -44,8 +34,7 @@ import java.util.Map;
public class ShiroApi { public class ShiroApi {
@Autowired @Autowired
private ProductionTaskListService productionTaskListService; private ProductionTaskListService productionTaskListService;
@Autowired
private UtilService utilService;
@Autowired @Autowired
private UserInfoService userInfoService; private UserInfoService userInfoService;
...@@ -245,14 +234,47 @@ public class ShiroApi { ...@@ -245,14 +234,47 @@ public class ShiroApi {
public String addProductionTaskList(@RequestParam("id") String id,@Context HttpServletResponse resp){ public String addProductionTaskList(@RequestParam("id") String id,@Context HttpServletResponse resp){
String map ="{\"productionTaskListId\":\"20181016001\",\"makeType\":4,\"oldMakeType\":7}"; String map ="{\"productionTaskListId\":\"20181016001\",\"makeType\":4,\"oldMakeType\":7}";
JSONObject jsonObject = JSONObject.fromObject(map); JSONObject jsonObject = JSONObject.fromObject(map);
ProductionTaskListEntity productionTaskListEntity = (ProductionTaskListEntity)jsonObject.toBean(jsonObject, ProductionTaskListEntity.class); Object productionTaskList = jsonObject.get("productionTaskList");
int production_task_list_seq = utilService.findProductionTaskListSequenceNextValue(); Object groupInfoList = jsonObject.get("groupInfoList");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyymmdd"); List<GroupinfoEntity> groupinfoEntities = (List<GroupinfoEntity>)groupInfoList;
productionTaskListEntity.setProductionTaskListId(simpleDateFormat.format(new Date())+production_task_list_seq); ProductionTaskListEntity productionTaskListEntity = (ProductionTaskListEntity)productionTaskList;
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
int i = productionTaskListService.addProductionTaskListEntity(productionTaskListEntity); int i = productionTaskListService.addProductionTaskListEntity(productionTaskListEntity,groupinfoEntities);
yxjsonResponse.outPutSuccess(i+"更新成功"); 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(); return yxjsonResponse.toJSONString();
} }
......
src/main/java/com/yxproject/start/api/UserInfoApi.java
View file @ 2b873e47
package com.yxproject.start.api; package com.yxproject.start.api;
import com.yxproject.start.entity.SysPermission; import com.yxproject.start.entity.*;
import com.yxproject.start.entity.SysRole;
import com.yxproject.start.entity.UserInfo;
import com.yxproject.start.service.ProductionTaskListService; import com.yxproject.start.service.ProductionTaskListService;
import com.yxproject.start.service.SysPermissionService; import com.yxproject.start.service.SysPermissionService;
import com.yxproject.start.service.SysRoleService; import com.yxproject.start.service.SysRoleService;
import com.yxproject.start.service.UserInfoService; import com.yxproject.start.service.UserInfoService;
import com.yxproject.start.service.impl.UserInfoServiceImpl;
import com.yxproject.start.utils.Md5Utils; import com.yxproject.start.utils.Md5Utils;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.IncorrectCredentialsException; import org.apache.shiro.authc.IncorrectCredentialsException;
import org.apache.shiro.authc.UnknownAccountException; import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authz.Permission;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpRequest;
import org.springframework.stereotype.Controller; 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.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.*; import javax.ws.rs.*;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import java.util.HashMap; import java.util.*;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.UUID;
/** /**
......
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; ...@@ -7,6 +7,7 @@ import com.yxproject.start.utils.DynamicDataSource;
import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.shiro.authc.credential.HashedCredentialsMatcher; import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
import org.apache.shiro.mgt.SecurityManager; 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.security.interceptor.AuthorizationAttributeSourceAdvisor;
import org.apache.shiro.spring.web.ShiroFilterFactoryBean; import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
import org.apache.shiro.web.mgt.DefaultWebSecurityManager; import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
...@@ -22,10 +23,7 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager; ...@@ -22,10 +23,7 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver; import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.util.HashMap; import java.util.*;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
/** /**
* @author Administrator * @author Administrator
...@@ -97,13 +95,18 @@ public class ShiroConfig { ...@@ -97,13 +95,18 @@ public class ShiroConfig {
@Bean @Bean
public SecurityManager securityManager(){ public SecurityManager securityManager(){
DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager(); DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
securityManager.setRealm(myShiroRealm()); List<Realm> realms = new ArrayList<>();
realms.add(myShiroRealm());
securityManager.setRealms(realms);
return securityManager; return securityManager;
} }
/** /**
* 开启shiro aop注解支持. * 开启shiro aop注解支持.
* 使用代理方式;所以需要开启代码支持; * 使用代理方式;所以需要开启代码支持;
......
src/main/java/com/yxproject/start/entity/GroupinfoEntity.java
View file @ 2b873e47
...@@ -8,9 +8,11 @@ import java.util.Objects; ...@@ -8,9 +8,11 @@ import java.util.Objects;
public class GroupinfoEntity { public class GroupinfoEntity {
private String groupid; private String groupid;
private String groupno; private String groupno;
private String cyclesheetid;
private Long grouptype; private Long grouptype;
private Long vaildCount; private Long valid_Count;
private Long invalidCount; private Long invalid_Count;
@Id @Id
@Column(name = "GROUPID", nullable = false, length = 20) @Column(name = "GROUPID", nullable = false, length = 20)
...@@ -32,6 +34,16 @@ public class GroupinfoEntity { ...@@ -32,6 +34,16 @@ public class GroupinfoEntity {
this.groupno = groupno; this.groupno = groupno;
} }
@Basic
@Column(name = "CYCLESHEETID", nullable = true, length = 20)
public String getCyclesheetid() {
return cyclesheetid;
}
public void setCyclesheetid(String cyclesheetid) {
this.cyclesheetid = cyclesheetid;
}
@Basic @Basic
@Column(name = "GROUPTYPE", nullable = true, precision = 0) @Column(name = "GROUPTYPE", nullable = true, precision = 0)
public Long getGrouptype() { public Long getGrouptype() {
...@@ -41,25 +53,23 @@ public class GroupinfoEntity { ...@@ -41,25 +53,23 @@ public class GroupinfoEntity {
public void setGrouptype(Long grouptype) { public void setGrouptype(Long grouptype) {
this.grouptype = grouptype; this.grouptype = grouptype;
} }
@Basic @Basic
@Column(name = "VAILD_COUNT", nullable = true, precision = 0) @Column(name = "VAILD_COUNT", nullable = true, precision = 0)
public Long getVaildCount() { public Long getValid_Count() {
return vaildCount; return valid_Count;
} }
public void setVaildCount(Long vaildCount) { public void setValid_Count(Long valid_Count) {
this.vaildCount = vaildCount; this.valid_Count = valid_Count;
} }
@Basic @Basic
@Column(name = "INVALID_COUNT", nullable = true, precision = 0) @Column(name = "INVALID_COUNT", nullable = true, precision = 0)
public Long getInvalidCount() { public Long getInvalid_Count() {
return invalidCount; return invalid_Count;
} }
public void setInvalidCount(Long invalidCount) { public void setInvalid_Count(Long invalid_Count) {
this.invalidCount = invalidCount; this.invalid_Count = invalid_Count;
} }
@Override @Override
...@@ -69,13 +79,14 @@ public class GroupinfoEntity { ...@@ -69,13 +79,14 @@ public class GroupinfoEntity {
GroupinfoEntity that = (GroupinfoEntity) o; GroupinfoEntity that = (GroupinfoEntity) o;
return Objects.equals(groupid, that.groupid) && return Objects.equals(groupid, that.groupid) &&
Objects.equals(groupno, that.groupno) && Objects.equals(groupno, that.groupno) &&
Objects.equals(cyclesheetid, that.cyclesheetid) &&
Objects.equals(grouptype, that.grouptype) && Objects.equals(grouptype, that.grouptype) &&
Objects.equals(vaildCount, that.vaildCount) && Objects.equals(valid_Count, that.valid_Count) &&
Objects.equals(invalidCount, that.invalidCount); Objects.equals(invalid_Count, that.invalid_Count);
} }
@Override @Override
public int hashCode() { 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; ...@@ -6,52 +6,49 @@ import java.util.Objects;
@Entity @Entity
@Table(name = "PRODUCTION_TASK_LIST", schema = "DAHAI", catalog = "") @Table(name = "PRODUCTION_TASK_LIST", schema = "DAHAI", catalog = "")
public class ProductionTaskListEntity { public class ProductionTaskListEntity {
private String productionTaskListId; private String production_TaskList_Id;
private long makeType; private long make_Type;
private Long oldMakeType; private Long old_Make_Type;
private String workshop; private String workshop;
private String citycode; private String citycode;
private String submitDate; private String submit_Date;
private String handoutDate; private String handout_Date;
private Long isPrint; private Long is_Print;
private String downloadDate; private String download_Date;
private String printOut; private String print_Out;
private String permanentPositionDate; private String permanent_Position_Date;
private String rollOutWorkshopDate; private String roll_Out_Workshop_Date;
private String qualityinspectionName; private String qualityinspection_Name;
private String qualityinspectionDate; private String qualityinspection_Date;
private String exceptionInformation; private String exception_Information;
private String outboundDate; private String outbound_Date;
private String putinstorageDate; private String putinstorage_Date;
@Id @Id
@Column(name = "PRODUCTION_TASK_LIST_ID", nullable = false, length = 20) @Column(name = "PRODUCTION_TASK_LIST_ID", nullable = false, length = 20)
public String getProductionTaskListId() { public String getProduction_TaskList_Id() {
return productionTaskListId; return production_TaskList_Id;
} }
public void setProductionTaskListId(String productionTaskListId) { public void setProduction_TaskList_Id(String production_TaskList_Id) {
this.productionTaskListId = productionTaskListId; this.production_TaskList_Id = production_TaskList_Id;
} }
@Basic @Basic
@Column(name = "MAKE_TYPE", nullable = false, precision = 0) @Column(name = "MAKE_TYPE", nullable = false, precision = 0)
public long getMakeType() { public long getMake_Type() {
return makeType; return make_Type;
} }
public void setMakeType(long makeType) { public void setMake_Type(long make_Type) {
this.makeType = makeType; this.make_Type = make_Type;
} }
@Basic @Basic
@Column(name = "OLD_MAKE_TYPE", nullable = true, precision = 0) @Column(name = "OLD_MAKE_TYPE", nullable = true, precision = 0)
public Long getOldMakeType() { public Long getOld_Make_Type() {
return oldMakeType; return old_Make_Type;
} }
public void setOldMakeType(Long oldMakeType) { public void setOld_Make_Type(Long old_Make_Type) {
this.oldMakeType = oldMakeType; this.old_Make_Type = old_Make_Type;
} }
@Basic @Basic
@Column(name = "CITYCODE",nullable = true, length = 8) @Column(name = "CITYCODE",nullable = true, length = 8)
...@@ -73,125 +70,113 @@ public class ProductionTaskListEntity { ...@@ -73,125 +70,113 @@ public class ProductionTaskListEntity {
public void setWorkshop(String workshop) { public void setWorkshop(String workshop) {
this.workshop = workshop; this.workshop = workshop;
} }
@Basic @Basic
@Column(name = "SUBMIT_DATE", nullable = true, length = 8) @Column(name = "SUBMIT_DATE", nullable = true, length = 8)
public String getSubmitDate() { public String getSubmit_Date() {
return submitDate; return submit_Date;
} }
public void setSubmitDate(String submitDate) { public void setSubmit_Date(String submit_Date) {
this.submitDate = submitDate; this.submit_Date = submit_Date;
} }
@Basic @Basic
@Column(name = "HANDOUT_DATE", nullable = true, length = 8) @Column(name = "HANDOUT_DATE", nullable = true, length = 8)
public String getHandoutDate() { public String getHandout_Date() {
return handoutDate; return handout_Date;
} }
public void setHandoutDate(String handoutDate) { public void setHandout_Date(String handout_Date) {
this.handoutDate = handoutDate; this.handout_Date = handout_Date;
} }
@Basic @Basic
@Column(name = "IS_PRINT", nullable = true, precision = 0) @Column(name = "IS_PRINT", nullable = true, precision = 0)
public Long getIsPrint() { public Long getIs_Print() {
return isPrint; return is_Print;
} }
public void setIsPrint(Long isPrint) { public void setIs_Print(Long is_Print) {
this.isPrint = isPrint; this.is_Print = is_Print;
} }
@Basic @Basic
@Column(name = "DOWNLOAD_DATE", nullable = true, length = 8) @Column(name = "DOWNLOAD_DATE", nullable = true, length = 8)
public String getDownloadDate() { public String getDownload_Date() {
return downloadDate; return download_Date;
} }
public void setDownloadDate(String downloadDate) { public void setDownload_Date(String download_Date) {
this.downloadDate = downloadDate; this.download_Date = download_Date;
} }
@Basic @Basic
@Column(name = "PRINT_OUT", nullable = true, length = 8) @Column(name = "PRINT_OUT", nullable = true, length = 8)
public String getPrintOut() { public String getPrint_Out() {
return printOut; return print_Out;
} }
public void setPrintOut(String printOut) { public void setPrint_Out(String print_Out) {
this.printOut = printOut; this.print_Out = print_Out;
} }
@Basic @Basic
@Column(name = "PERMANENT_POSITION_DATE", nullable = true, length = 8) @Column(name = "PERMANENT_POSITION_DATE", nullable = true, length = 8)
public String getPermanentPositionDate() { public String getPermanent_Position_Date() {
return permanentPositionDate; return permanent_Position_Date;
} }
public void setPermanentPositionDate(String permanentPositionDate) { public void setPermanent_Position_Date(String permanent_Position_Date) {
this.permanentPositionDate = permanentPositionDate; this.permanent_Position_Date = permanent_Position_Date;
} }
@Basic @Basic
@Column(name = "ROLL_OUT_WORKSHOP_DATE", nullable = true, length = 8) @Column(name = "ROLL_OUT_WORKSHOP_DATE", nullable = true, length = 8)
public String getRollOutWorkshopDate() { public String getRoll_Out_Workshop_Date() {
return rollOutWorkshopDate; return roll_Out_Workshop_Date;
} }
public void setRollOutWorkshopDate(String rollOutWorkshopDate) { public void setRoll_Out_Workshop_Date(String roll_Out_Workshop_Date) {
this.rollOutWorkshopDate = rollOutWorkshopDate; this.roll_Out_Workshop_Date = roll_Out_Workshop_Date;
} }
@Basic @Basic
@Column(name = "QUALITYINSPECTION_NAME", nullable = true, length = 20) @Column(name = "QUALITYINSPECTION_NAME", nullable = true, length = 20)
public String getQualityinspectionName() { public String getQualityinspection_Name() {
return qualityinspectionName; return qualityinspection_Name;
} }
public void setQualityinspectionName(String qualityinspectionName) { public void setQualityinspection_Name(String qualityinspection_Name) {
this.qualityinspectionName = qualityinspectionName; this.qualityinspection_Name = qualityinspection_Name;
} }
@Basic @Basic
@Column(name = "QUALITYINSPECTION_DATE", nullable = true, length = 8) @Column(name = "QUALITYINSPECTION_DATE", nullable = true, length = 8)
public String getQualityinspectionDate() { public String getQualityinspection_Date() {
return qualityinspectionDate; return qualityinspection_Date;
} }
public void setQualityinspectionDate(String qualityinspectionDate) { public void setQualityinspection_Date(String qualityinspection_Date) {
this.qualityinspectionDate = qualityinspectionDate; this.qualityinspection_Date = qualityinspection_Date;
} }
@Basic @Basic
@Column(name = "EXCEPTION_INFORMATION", nullable = true, length = 120) @Column(name = "EXCEPTION_INFORMATION", nullable = true, length = 120)
public String getExceptionInformation() { public String getException_Information() {
return exceptionInformation; return exception_Information;
} }
public void setExceptionInformation(String exceptionInformation) { public void setException_Information(String exception_Information) {
this.exceptionInformation = exceptionInformation; this.exception_Information = exception_Information;
} }
@Basic @Basic
@Column(name = "OUTBOUND_DATE", nullable = true, length = 8) @Column(name = "OUTBOUND_DATE", nullable = true, length = 8)
public String getOutboundDate() { public String getOutbound_Date() {
return outboundDate; return outbound_Date;
} }
public void setOutboundDate(String outboundDate) { public void setOutbound_Date(String outbound_Date) {
this.outboundDate = outboundDate; this.outbound_Date = outbound_Date;
} }
@Basic @Basic
@Column(name = "PUTINSTORAGE_DATE", nullable = true, length = 8) @Column(name = "PUTINSTORAGE_DATE", nullable = true, length = 8)
public String getPutinstorageDate() { public String getPutinstorage_Date() {
return putinstorageDate; return putinstorage_Date;
} }
public void setPutinstorageDate(String putinstorageDate) { public void setPutinstorage_Date(String putinstorage_Date) {
this.putinstorageDate = putinstorageDate; this.putinstorage_Date = putinstorage_Date;
} }
@Override @Override
...@@ -199,27 +184,27 @@ public class ProductionTaskListEntity { ...@@ -199,27 +184,27 @@ public class ProductionTaskListEntity {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
ProductionTaskListEntity that = (ProductionTaskListEntity) o; ProductionTaskListEntity that = (ProductionTaskListEntity) o;
return makeType == that.makeType && return make_Type == that.make_Type &&
Objects.equals(productionTaskListId, that.productionTaskListId) && Objects.equals(production_TaskList_Id, that.production_TaskList_Id) &&
Objects.equals(oldMakeType, that.oldMakeType) && Objects.equals(old_Make_Type, that.old_Make_Type) &&
Objects.equals(citycode, that.citycode) && Objects.equals(citycode, that.citycode) &&
Objects.equals(workshop, that.workshop) && Objects.equals(workshop, that.workshop) &&
Objects.equals(submitDate, that.submitDate) && Objects.equals(submit_Date, that.submit_Date) &&
Objects.equals(handoutDate, that.handoutDate) && Objects.equals(handout_Date, that.handout_Date) &&
Objects.equals(isPrint, that.isPrint) && Objects.equals(is_Print, that.is_Print) &&
Objects.equals(downloadDate, that.downloadDate) && Objects.equals(download_Date, that.download_Date) &&
Objects.equals(printOut, that.printOut) && Objects.equals(print_Out, that.print_Out) &&
Objects.equals(permanentPositionDate, that.permanentPositionDate) && Objects.equals(permanent_Position_Date, that.permanent_Position_Date) &&
Objects.equals(rollOutWorkshopDate, that.rollOutWorkshopDate) && Objects.equals(roll_Out_Workshop_Date, that.roll_Out_Workshop_Date) &&
Objects.equals(qualityinspectionName, that.qualityinspectionName) && Objects.equals(qualityinspection_Name, that.qualityinspection_Name) &&
Objects.equals(qualityinspectionDate, that.qualityinspectionDate) && Objects.equals(qualityinspection_Date, that.qualityinspection_Date) &&
Objects.equals(exceptionInformation, that.exceptionInformation) && Objects.equals(exception_Information, that.exception_Information) &&
Objects.equals(outboundDate, that.outboundDate) && Objects.equals(outbound_Date, that.outbound_Date) &&
Objects.equals(putinstorageDate, that.putinstorageDate); Objects.equals(putinstorage_Date, that.putinstorage_Date);
} }
@Override @Override
public int hashCode() { 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; ...@@ -6,52 +6,50 @@ import java.util.Objects;
@Entity @Entity
@Table(name = "ACC_CARD_T", schema = "ACC_DBA", catalog = "") @Table(name = "ACC_CARD_T", schema = "ACC_DBA", catalog = "")
public class AccCardTEntity { public class AccCardTEntity {
private String uploadNo; private String upload_No;
private String acceptNo; private String accept_No;
private String photoNo; private String photo_No;
private String name; private String name;
private String sexNo; private String sex_No;
private String nationNo; private String nation_No;
private String birthday; private String birthday;
private String idNo; private String id_No;
private String addr1; private String addr1;
private String addr2; private String addr2;
private String addr3; private String addr3;
private String address1; private String address1;
private String signGovt; private String sign_Govt;
private String expireDate; private String expire_Date;
private String beginDate; private String begin_Date;
private String applyReason; private String apply_Reason;
private String statusNo; private String status_No;
@Basic @Basic
@Column(name = "UPLOAD_NO", nullable = false, length = 22) @Column(name = "UPLOAD_NO", nullable = false, length = 22)
public String getUploadNo() { public String getUpload_No() {
return uploadNo; return upload_No;
} }
public void setUploadNo(String uploadNo) { public void setUpload_No(String upload_No) {
this.uploadNo = uploadNo; this.upload_No = upload_No;
} }
@Id @Id
@Column(name = "ACCEPT_NO", nullable = false, length = 12) @Column(name = "ACCEPT_NO", nullable = false, length = 12)
public String getAcceptNo() { public String getAccept_No() {
return acceptNo; return accept_No;
} }
public void setAcceptNo(String acceptNo) { public void setAccept_No(String accept_No) {
this.acceptNo = acceptNo; this.accept_No = accept_No;
} }
@Basic @Basic
@Column(name = "PHOTO_NO", nullable = true, length = 12) @Column(name = "PHOTO_NO", nullable = true, length = 12)
public String getPhotoNo() { public String getPhoto_No() {
return photoNo; return photo_No;
} }
public void setPhotoNo(String photoNo) { public void setPhoto_No(String photo_No) {
this.photoNo = photoNo; this.photo_No = photo_No;
} }
@Basic @Basic
...@@ -63,25 +61,23 @@ public class AccCardTEntity { ...@@ -63,25 +61,23 @@ public class AccCardTEntity {
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
@Basic @Basic
@Column(name = "SEX_NO", nullable = false, length = 1) @Column(name = "SEX_NO", nullable = false, length = 1)
public String getSexNo() { public String getSex_No() {
return sexNo; return sex_No;
} }
public void setSexNo(String sexNo) { public void setSex_No(String sex_No) {
this.sexNo = sexNo; this.sex_No = sex_No;
} }
@Basic @Basic
@Column(name = "NATION_NO", nullable = false, length = 2) @Column(name = "NATION_NO", nullable = false, length = 2)
public String getNationNo() { public String getNation_No() {
return nationNo; return nation_No;
} }
public void setNationNo(String nationNo) { public void setNation_No(String nation_No) {
this.nationNo = nationNo; this.nation_No = nation_No;
} }
@Basic @Basic
...@@ -93,15 +89,14 @@ public class AccCardTEntity { ...@@ -93,15 +89,14 @@ public class AccCardTEntity {
public void setBirthday(String birthday) { public void setBirthday(String birthday) {
this.birthday = birthday; this.birthday = birthday;
} }
@Basic @Basic
@Column(name = "ID_NO", nullable = false, length = 18) @Column(name = "ID_NO", nullable = false, length = 18)
public String getIdNo() { public String getId_No() {
return idNo; return id_No;
} }
public void setIdNo(String idNo) { public void setId_No(String id_No) {
this.idNo = idNo; this.id_No = id_No;
} }
@Basic @Basic
...@@ -143,55 +138,50 @@ public class AccCardTEntity { ...@@ -143,55 +138,50 @@ public class AccCardTEntity {
public void setAddress1(String address1) { public void setAddress1(String address1) {
this.address1 = address1; this.address1 = address1;
} }
@Basic @Basic
@Column(name = "SIGN_GOVT", nullable = false, length = 45) @Column(name = "SIGN_GOVT", nullable = false, length = 45)
public String getSignGovt() { public String getSign_Govt() {
return signGovt; return sign_Govt;
} }
public void setSignGovt(String signGovt) { public void setSign_Govt(String sign_Govt) {
this.signGovt = signGovt; this.sign_Govt = sign_Govt;
} }
@Basic @Basic
@Column(name = "EXPIRE_DATE", nullable = false, length = 8) @Column(name = "EXPIRE_DATE", nullable = false, length = 8)
public String getExpireDate() { public String getExpire_Date() {
return expireDate; return expire_Date;
} }
public void setExpireDate(String expireDate) { public void setExpire_Date(String expire_Date) {
this.expireDate = expireDate; this.expire_Date = expire_Date;
} }
@Basic @Basic
@Column(name = "BEGIN_DATE", nullable = false, length = 8) @Column(name = "BEGIN_DATE", nullable = false, length = 8)
public String getBeginDate() { public String getBegin_Date() {
return beginDate; return begin_Date;
} }
public void setBeginDate(String beginDate) { public void setBegin_Date(String begin_Date) {
this.beginDate = beginDate; this.begin_Date = begin_Date;
} }
@Basic @Basic
@Column(name = "APPLY_REASON", nullable = false, length = 2) @Column(name = "APPLY_REASON", nullable = false, length = 2)
public String getApplyReason() { public String getApply_Reason() {
return applyReason; return apply_Reason;
} }
public void setApplyReason(String applyReason) { public void setApply_Reason(String apply_Reason) {
this.applyReason = applyReason; this.apply_Reason = apply_Reason;
} }
@Basic @Basic
@Column(name = "STATUS_NO", nullable = true, length = 1) @Column(name = "STATUS_NO", nullable = true, length = 1)
public String getStatusNo() { public String getStatus_No() {
return statusNo; return status_No;
} }
public void setStatusNo(String statusNo) { public void setStatus_No(String status_No) {
this.statusNo = statusNo; this.status_No = status_No;
} }
@Override @Override
...@@ -199,27 +189,28 @@ public class AccCardTEntity { ...@@ -199,27 +189,28 @@ public class AccCardTEntity {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
AccCardTEntity that = (AccCardTEntity) o; AccCardTEntity that = (AccCardTEntity) o;
return Objects.equals(uploadNo, that.uploadNo) && return Objects.equals(upload_No, that.upload_No) &&
Objects.equals(acceptNo, that.acceptNo) && Objects.equals(accept_No, that.accept_No) &&
Objects.equals(photoNo, that.photoNo) && Objects.equals(photo_No, that.photo_No) &&
Objects.equals(name, that.name) && Objects.equals(name, that.name) &&
Objects.equals(sexNo, that.sexNo) && Objects.equals(sex_No, that.sex_No) &&
Objects.equals(nationNo, that.nationNo) && Objects.equals(nation_No, that.nation_No) &&
Objects.equals(birthday, that.birthday) && Objects.equals(birthday, that.birthday) &&
Objects.equals(idNo, that.idNo) && Objects.equals(id_No, that.id_No) &&
Objects.equals(addr1, that.addr1) && Objects.equals(addr1, that.addr1) &&
Objects.equals(addr2, that.addr2) && Objects.equals(addr2, that.addr2) &&
Objects.equals(addr3, that.addr3) && Objects.equals(addr3, that.addr3) &&
Objects.equals(address1, that.address1) && Objects.equals(address1, that.address1) &&
Objects.equals(signGovt, that.signGovt) && Objects.equals(sign_Govt, that.sign_Govt) &&
Objects.equals(expireDate, that.expireDate) && Objects.equals(expire_Date, that.expire_Date) &&
Objects.equals(beginDate, that.beginDate) && Objects.equals(begin_Date, that.begin_Date) &&
Objects.equals(applyReason, that.applyReason) && Objects.equals(apply_Reason, that.apply_Reason) &&
Objects.equals(statusNo, that.statusNo); Objects.equals(status_No, that.status_No);
} }
@Override @Override
public int hashCode() { 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; ...@@ -6,60 +6,55 @@ import java.util.Objects;
@Entity @Entity
@Table(name = "ACC_GROUP_RELATION_T", schema = "ACC_DBA", catalog = "") @Table(name = "ACC_GROUP_RELATION_T", schema = "ACC_DBA", catalog = "")
public class AccGroupRelationTEntity { public class AccGroupRelationTEntity {
private String groupNo; private String group_No;
private String originalNo; private String original_No;
private String dealStatus; private String deal_Status;
private String dealDate; private String deal_Date;
private String uploadUnitNo; private String upload_Unit_No;
@Id @Id
@Column(name = "GROUP_NO", nullable = false, length = 10) @Column(name = "GROUP_NO", nullable = false, length = 10)
public String getGroupNo() { public String getGroup_No() {
return groupNo; return group_No;
} }
public void setGroupNo(String groupNo) { public void setGroup_No(String group_No) {
this.groupNo = groupNo; this.group_No = group_No;
} }
@Basic @Basic
@Column(name = "ORIGINAL_NO", nullable = false, length = 25) @Column(name = "ORIGINAL_NO", nullable = false, length = 25)
public String getOriginalNo() { public String getOriginal_No() {
return originalNo; return original_No;
} }
public void setOriginalNo(String originalNo) { public void setOriginal_No(String original_No) {
this.originalNo = originalNo; this.original_No = original_No;
} }
@Basic @Basic
@Column(name = "DEAL_STATUS", nullable = true, length = 1) @Column(name = "DEAL_STATUS", nullable = true, length = 1)
public String getDealStatus() { public String getDeal_Status() {
return dealStatus; return deal_Status;
} }
public void setDealStatus(String dealStatus) { public void setDeal_Status(String deal_Status) {
this.dealStatus = dealStatus; this.deal_Status = deal_Status;
} }
@Basic @Basic
@Column(name = "DEAL_DATE", nullable = false, length = 8) @Column(name = "DEAL_DATE", nullable = false, length = 8)
public String getDealDate() { public String getDeal_Date() {
return dealDate; return deal_Date;
} }
public void setDealDate(String dealDate) { public void setDeal_Date(String deal_Date) {
this.dealDate = dealDate; this.deal_Date = deal_Date;
} }
@Basic @Basic
@Column(name = "UPLOAD_UNIT_NO", nullable = false, length = 12) @Column(name = "UPLOAD_UNIT_NO", nullable = false, length = 12)
public String getUploadUnitNo() { public String getUpload_Unit_No() {
return uploadUnitNo; return upload_Unit_No;
} }
public void setUploadUnitNo(String uploadUnitNo) { public void setUpload_Unit_No(String upload_Unit_No) {
this.uploadUnitNo = uploadUnitNo; this.upload_Unit_No = upload_Unit_No;
} }
@Override @Override
...@@ -67,15 +62,15 @@ public class AccGroupRelationTEntity { ...@@ -67,15 +62,15 @@ public class AccGroupRelationTEntity {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
AccGroupRelationTEntity that = (AccGroupRelationTEntity) o; AccGroupRelationTEntity that = (AccGroupRelationTEntity) o;
return Objects.equals(groupNo, that.groupNo) && return Objects.equals(group_No, that.group_No) &&
Objects.equals(originalNo, that.originalNo) && Objects.equals(original_No, that.original_No) &&
Objects.equals(dealStatus, that.dealStatus) && Objects.equals(deal_Status, that.deal_Status) &&
Objects.equals(dealDate, that.dealDate) && Objects.equals(deal_Date, that.deal_Date) &&
Objects.equals(uploadUnitNo, that.uploadUnitNo); Objects.equals(upload_Unit_No, that.upload_Unit_No);
} }
@Override @Override
public int hashCode() { 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; ...@@ -7,93 +7,85 @@ import java.util.Objects;
@Entity @Entity
@Table(name = "ACC_GROUP_T", schema = "ACC_DBA", catalog = "") @Table(name = "ACC_GROUP_T", schema = "ACC_DBA", catalog = "")
public class AccGroupTEntity { public class AccGroupTEntity {
private String groupNo; private String group_No;
private String userCode; private String user_Code;
private Time importTime; private Time import_Time;
private String dealFlag; private String deal_Flag;
private Byte validCount; private Byte valid_Count;
private Byte invalidCount; private Byte invalid_Count;
private Time submitDate; private Time submit_Date;
private String submitCode; private String submit_Code;
@Id @Id
@Column(name = "GROUP_NO", nullable = false, length = 10) @Column(name = "GROUP_NO", nullable = false, length = 10)
public String getGroupNo() { public String getGroup_No() {
return groupNo; return group_No;
} }
public void setGroupNo(String groupNo) { public void setGroup_No(String group_No) {
this.groupNo = groupNo; this.group_No = group_No;
} }
@Basic @Basic
@Column(name = "USER_CODE", nullable = true, length = 8) @Column(name = "USER_CODE", nullable = true, length = 8)
public String getUserCode() { public String getUser_Code() {
return userCode; return user_Code;
} }
public void setUserCode(String userCode) { public void setUser_Code(String user_Code) {
this.userCode = userCode; this.user_Code = user_Code;
} }
@Basic @Basic
@Column(name = "IMPORT_TIME", nullable = true) @Column(name = "IMPORT_TIME", nullable = true)
public Time getImportTime() { public Time getImport_Time() {
return importTime; return import_Time;
} }
public void setImportTime(Time importTime) { public void setImport_Time(Time import_Time) {
this.importTime = importTime; this.import_Time = import_Time;
} }
@Basic @Basic
@Column(name = "DEAL_FLAG", nullable = false, length = 1) @Column(name = "DEAL_FLAG", nullable = false, length = 1)
public String getDealFlag() { public String getDeal_Flag() {
return dealFlag; return deal_Flag;
} }
public void setDealFlag(String dealFlag) { public void setDeal_Flag(String deal_Flag) {
this.dealFlag = dealFlag; this.deal_Flag = deal_Flag;
} }
@Basic @Basic
@Column(name = "VALID_COUNT", nullable = true, precision = 0) @Column(name = "VALID_COUNT", nullable = true, precision = 0)
public Byte getValidCount() { public Byte getValid_Count() {
return validCount; return valid_Count;
} }
public void setValidCount(Byte validCount) { public void setValid_Count(Byte valid_Count) {
this.validCount = validCount; this.valid_Count = valid_Count;
} }
@Basic @Basic
@Column(name = "INVALID_COUNT", nullable = true, precision = 0) @Column(name = "INVALID_COUNT", nullable = true, precision = 0)
public Byte getInvalidCount() { public Byte getInvalid_Count() {
return invalidCount; return invalid_Count;
} }
public void setInvalidCount(Byte invalidCount) { public void setInvalid_Count(Byte invalid_Count) {
this.invalidCount = invalidCount; this.invalid_Count = invalid_Count;
} }
@Basic @Basic
@Column(name = "SUBMIT_DATE", nullable = true) @Column(name = "SUBMIT_DATE", nullable = true)
public Time getSubmitDate() { public Time getSubmit_Date() {
return submitDate; return submit_Date;
} }
public void setSubmitDate(Time submitDate) { public void setSubmit_Date(Time submit_Date) {
this.submitDate = submitDate; this.submit_Date = submit_Date;
} }
@Basic @Basic
@Column(name = "SUBMIT_CODE", nullable = true, length = 8) @Column(name = "SUBMIT_CODE", nullable = true, length = 8)
public String getSubmitCode() { public String getSubmit_Code() {
return submitCode; return submit_Code;
} }
public void setSubmitCode(String submitCode) { public void setSubmit_Code(String submit_Code) {
this.submitCode = submitCode; this.submit_Code = submit_Code;
} }
@Override @Override
...@@ -101,18 +93,18 @@ public class AccGroupTEntity { ...@@ -101,18 +93,18 @@ public class AccGroupTEntity {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
AccGroupTEntity that = (AccGroupTEntity) o; AccGroupTEntity that = (AccGroupTEntity) o;
return Objects.equals(groupNo, that.groupNo) && return Objects.equals(group_No, that.group_No) &&
Objects.equals(userCode, that.userCode) && Objects.equals(user_Code, that.user_Code) &&
Objects.equals(importTime, that.importTime) && Objects.equals(import_Time, that.import_Time) &&
Objects.equals(dealFlag, that.dealFlag) && Objects.equals(deal_Flag, that.deal_Flag) &&
Objects.equals(validCount, that.validCount) && Objects.equals(valid_Count, that.valid_Count) &&
Objects.equals(invalidCount, that.invalidCount) && Objects.equals(invalid_Count, that.invalid_Count) &&
Objects.equals(submitDate, that.submitDate) && Objects.equals(submit_Date, that.submit_Date) &&
Objects.equals(submitCode, that.submitCode); Objects.equals(submit_Code, that.submit_Code);
} }
@Override @Override
public int hashCode() { 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; ...@@ -6,124 +6,117 @@ import java.util.Objects;
@Entity @Entity
@Table(name = "PROD_APPLY_INFO_T", schema = "PROD_DBA", catalog = "") @Table(name = "PROD_APPLY_INFO_T", schema = "PROD_DBA", catalog = "")
public class ProdApplyInfoTEntity { public class ProdApplyInfoTEntity {
private String uploadNo; private String upload_No;
private String acceptNo; private String accept_No;
private String makeType; private String make_Type;
private String applyName; private String apply_Name;
private String applyPhone; private String apply_Phone;
private String applyPostcode; private String apply_Postcode;
private String applyAddress; private String apply_Address;
private String drawType; private String draw_Type;
private String provinceNo; private String province_No;
@Basic @Basic
@Column(name = "UPLOAD_NO", nullable = false, length = 22) @Column(name = "UPLOAD_NO", nullable = false, length = 22)
public String getUploadNo() { public String getUpload_No() {
return uploadNo; return upload_No;
} }
public void setUploadNo(String uploadNo) { public void setUpload_No(String upload_No) {
this.uploadNo = uploadNo; this.upload_No = upload_No;
} }
@Id @Id
@Column(name = "ACCEPT_NO", nullable = false, length = 12) @Column(name = "ACCEPT_NO", nullable = false, length = 12)
public String getAcceptNo() { public String getAccept_No() {
return acceptNo; return accept_No;
} }
public void setAcceptNo(String acceptNo) { public void setAccept_No(String accept_No) {
this.acceptNo = acceptNo; this.accept_No = accept_No;
} }
@Basic @Basic
@Column(name = "MAKE_TYPE", nullable = true, length = 1) @Column(name = "MAKE_TYPE", nullable = true, length = 1)
public String getMakeType() { public String getMake_Type() {
return makeType; return make_Type;
} }
public void setMakeType(String makeType) { public void setMake_Type(String make_Type) {
this.makeType = makeType; this.make_Type = make_Type;
} }
@Basic @Basic
@Column(name = "APPLY_NAME", nullable = true, length = 45) @Column(name = "APPLY_NAME", nullable = true, length = 45)
public String getApplyName() { public String getApply_Name() {
return applyName; return apply_Name;
} }
public void setApplyName(String applyName) { public void setApply_Name(String apply_Name) {
this.applyName = applyName; this.apply_Name = apply_Name;
} }
@Basic @Basic
@Column(name = "APPLY_PHONE", nullable = true, length = 20) @Column(name = "APPLY_PHONE", nullable = true, length = 20)
public String getApplyPhone() { public String getApply_Phone() {
return applyPhone; return apply_Phone;
} }
public void setApplyPhone(String applyPhone) { public void setApply_Phone(String apply_Phone) {
this.applyPhone = applyPhone; this.apply_Phone = apply_Phone;
} }
@Basic @Basic
@Column(name = "APPLY_POSTCODE", nullable = true, length = 6) @Column(name = "APPLY_POSTCODE", nullable = true, length = 6)
public String getApplyPostcode() { public String getApply_Postcode() {
return applyPostcode; return apply_Postcode;
} }
public void setApplyPostcode(String applyPostcode) { public void setApply_Postcode(String apply_Postcode) {
this.applyPostcode = applyPostcode; this.apply_Postcode = apply_Postcode;
} }
@Basic @Basic
@Column(name = "APPLY_ADDRESS", nullable = true, length = 105) @Column(name = "APPLY_ADDRESS", nullable = true, length = 105)
public String getApplyAddress() { public String getApply_Address() {
return applyAddress; return apply_Address;
} }
public void setApplyAddress(String applyAddress) { public void setApply_Address(String apply_Address) {
this.applyAddress = applyAddress; this.apply_Address = apply_Address;
} }
@Basic @Basic
@Column(name = "DRAW_TYPE", nullable = false, length = 2) @Column(name = "DRAW_TYPE", nullable = false, length = 2)
public String getDrawType() { public String getDraw_Type() {
return drawType; return draw_Type;
} }
public void setDrawType(String drawType) { public void setDraw_Type(String draw_Type) {
this.drawType = drawType; this.draw_Type = draw_Type;
} }
@Basic @Basic
@Column(name = "PROVINCE_NO", nullable = true, length = 6) @Column(name = "PROVINCE_NO", nullable = true, length = 6)
public String getProvinceNo() { public String getProvince_No() {
return provinceNo; return province_No;
} }
public void setProvinceNo(String provinceNo) { public void setProvince_No(String province_No) {
this.provinceNo = provinceNo; this.province_No = province_No;
} }
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
ProdApplyInfoTEntity that = (ProdApplyInfoTEntity) o; ProdApplyInfoTEntity that = (ProdApplyInfoTEntity) o;
return Objects.equals(uploadNo, that.uploadNo) && return Objects.equals(upload_No, that.upload_No) &&
Objects.equals(acceptNo, that.acceptNo) && Objects.equals(accept_No, that.accept_No) &&
Objects.equals(makeType, that.makeType) && Objects.equals(make_Type, that.make_Type) &&
Objects.equals(applyName, that.applyName) && Objects.equals(apply_Name, that.apply_Name) &&
Objects.equals(applyPhone, that.applyPhone) && Objects.equals(apply_Phone, that.apply_Phone) &&
Objects.equals(applyPostcode, that.applyPostcode) && Objects.equals(apply_Postcode, that.apply_Postcode) &&
Objects.equals(applyAddress, that.applyAddress) && Objects.equals(apply_Address, that.apply_Address) &&
Objects.equals(drawType, that.drawType) && Objects.equals(draw_Type, that.draw_Type) &&
Objects.equals(provinceNo, that.provinceNo); Objects.equals(province_No, that.province_No);
} }
@Override @Override
public int hashCode() { 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; package com.yxproject.start.entity.prod;
import com.yxproject.start.entity.accu.AccCardTEntity;
import javax.persistence.*; import javax.persistence.*;
import java.util.Objects; import java.util.Objects;
@Entity @Entity
@Table(name = "PROD_CARD_T", schema = "PROD_DBA", catalog = "") @Table(name = "PROD_CARD_T", schema = "PROD_DBA", catalog = "")
public class ProdCardTEntity { public class ProdCardTEntity {
private String uploadNo; private String upload_No;
private String acceptNo; private String accept_No;
private String photoNo; private String photo_No;
private String name; private String name;
private String sexNo; private String sex_No;
private String nationNo; private String nation_No;
private String birthday; private String birthday;
private String idNo; private String id_No;
private String addr1; private String addr1;
private String addr2; private String addr2;
private String addr3; private String addr3;
private String address1; private String address1;
private String signGovt; private String sign_Govt;
private String expireDate; private String expire_Date;
private String beginDate; private String begin_Date;
private String applyReason; private String apply_Reason;
private String statusNo; private String status_No;
private String cardSerial;
@Basic @Basic
@Column(name = "UPLOAD_NO", nullable = false, length = 22) @Column(name = "UPLOAD_NO", nullable = false, length = 22)
public String getUploadNo() { public String getUpload_No() {
return uploadNo; return upload_No;
} }
public void setUploadNo(String uploadNo) { public void setUpload_No(String upload_No) {
this.uploadNo = uploadNo; this.upload_No = upload_No;
} }
@Id @Id
@Column(name = "ACCEPT_NO", nullable = false, length = 12) @Column(name = "ACCEPT_NO", nullable = false, length = 12)
public String getAcceptNo() { public String getAccept_No() {
return acceptNo; return accept_No;
} }
public void setAcceptNo(String acceptNo) { public void setAccept_No(String accept_No) {
this.acceptNo = acceptNo; this.accept_No = accept_No;
} }
@Basic @Basic
@Column(name = "PHOTO_NO", nullable = true, length = 12) @Column(name = "PHOTO_NO", nullable = true, length = 12)
public String getPhotoNo() { public String getPhoto_No() {
return photoNo; return photo_No;
} }
public void setPhotoNo(String photoNo) { public void setPhoto_No(String photo_No) {
this.photoNo = photoNo; this.photo_No = photo_No;
} }
@Basic @Basic
...@@ -64,25 +63,23 @@ public class ProdCardTEntity { ...@@ -64,25 +63,23 @@ public class ProdCardTEntity {
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
@Basic @Basic
@Column(name = "SEX_NO", nullable = false, length = 1) @Column(name = "SEX_NO", nullable = false, length = 1)
public String getSexNo() { public String getSex_No() {
return sexNo; return sex_No;
} }
public void setSexNo(String sexNo) { public void setSex_No(String sex_No) {
this.sexNo = sexNo; this.sex_No = sex_No;
} }
@Basic @Basic
@Column(name = "NATION_NO", nullable = false, length = 2) @Column(name = "NATION_NO", nullable = false, length = 2)
public String getNationNo() { public String getNation_No() {
return nationNo; return nation_No;
} }
public void setNationNo(String nationNo) { public void setNation_No(String nation_No) {
this.nationNo = nationNo; this.nation_No = nation_No;
} }
@Basic @Basic
...@@ -94,15 +91,14 @@ public class ProdCardTEntity { ...@@ -94,15 +91,14 @@ public class ProdCardTEntity {
public void setBirthday(String birthday) { public void setBirthday(String birthday) {
this.birthday = birthday; this.birthday = birthday;
} }
@Basic @Basic
@Column(name = "ID_NO", nullable = false, length = 18) @Column(name = "ID_NO", nullable = false, length = 18)
public String getIdNo() { public String getId_No() {
return idNo; return id_No;
} }
public void setIdNo(String idNo) { public void setId_No(String id_No) {
this.idNo = idNo; this.id_No = id_No;
} }
@Basic @Basic
...@@ -144,94 +140,78 @@ public class ProdCardTEntity { ...@@ -144,94 +140,78 @@ public class ProdCardTEntity {
public void setAddress1(String address1) { public void setAddress1(String address1) {
this.address1 = address1; this.address1 = address1;
} }
@Basic @Basic
@Column(name = "SIGN_GOVT", nullable = false, length = 45) @Column(name = "SIGN_GOVT", nullable = false, length = 45)
public String getSignGovt() { public String getSign_Govt() {
return signGovt; return sign_Govt;
} }
public void setSignGovt(String signGovt) { public void setSign_Govt(String sign_Govt) {
this.signGovt = signGovt; this.sign_Govt = sign_Govt;
} }
@Basic @Basic
@Column(name = "EXPIRE_DATE", nullable = false, length = 8) @Column(name = "EXPIRE_DATE", nullable = false, length = 8)
public String getExpireDate() { public String getExpire_Date() {
return expireDate; return expire_Date;
} }
public void setExpireDate(String expireDate) { public void setExpire_Date(String expire_Date) {
this.expireDate = expireDate; this.expire_Date = expire_Date;
} }
@Basic @Basic
@Column(name = "BEGIN_DATE", nullable = false, length = 8) @Column(name = "BEGIN_DATE", nullable = false, length = 8)
public String getBeginDate() { public String getBegin_Date() {
return beginDate; return begin_Date;
} }
public void setBeginDate(String beginDate) { public void setBegin_Date(String begin_Date) {
this.beginDate = beginDate; this.begin_Date = begin_Date;
} }
@Basic @Basic
@Column(name = "APPLY_REASON", nullable = false, length = 2) @Column(name = "APPLY_REASON", nullable = false, length = 2)
public String getApplyReason() { public String getApply_Reason() {
return applyReason; return apply_Reason;
}
public void setApplyReason(String applyReason) {
this.applyReason = applyReason;
} }
@Basic public void setApply_Reason(String apply_Reason) {
@Column(name = "STATUS_NO", nullable = false, length = 1) this.apply_Reason = apply_Reason;
public String getStatusNo() {
return statusNo;
}
public void setStatusNo(String statusNo) {
this.statusNo = statusNo;
} }
@Basic @Basic
@Column(name = "CARD_SERIAL", nullable = true, length = 32) @Column(name = "STATUS_NO", nullable = true, length = 1)
public String getCardSerial() { public String getStatus_No() {
return cardSerial; return status_No;
} }
public void setCardSerial(String cardSerial) { public void setStatus_No(String status_No) {
this.cardSerial = cardSerial; this.status_No = status_No;
} }
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
ProdCardTEntity that = (ProdCardTEntity) o; AccCardTEntity that = (AccCardTEntity) o;
return Objects.equals(uploadNo, that.uploadNo) && return Objects.equals(upload_No, this.upload_No) &&
Objects.equals(acceptNo, that.acceptNo) && Objects.equals(accept_No, this.accept_No) &&
Objects.equals(photoNo, that.photoNo) && Objects.equals(photo_No, this.photo_No) &&
Objects.equals(name, that.name) && Objects.equals(name, this.name) &&
Objects.equals(sexNo, that.sexNo) && Objects.equals(sex_No, this.sex_No) &&
Objects.equals(nationNo, that.nationNo) && Objects.equals(nation_No, this.nation_No) &&
Objects.equals(birthday, that.birthday) && Objects.equals(birthday, this.birthday) &&
Objects.equals(idNo, that.idNo) && Objects.equals(id_No, this.id_No) &&
Objects.equals(addr1, that.addr1) && Objects.equals(addr1, this.addr1) &&
Objects.equals(addr2, that.addr2) && Objects.equals(addr2, this.addr2) &&
Objects.equals(addr3, that.addr3) && Objects.equals(addr3, this.addr3) &&
Objects.equals(address1, that.address1) && Objects.equals(address1, this.address1) &&
Objects.equals(signGovt, that.signGovt) && Objects.equals(sign_Govt, this.sign_Govt) &&
Objects.equals(expireDate, that.expireDate) && Objects.equals(expire_Date, this.expire_Date) &&
Objects.equals(beginDate, that.beginDate) && Objects.equals(begin_Date, this.begin_Date) &&
Objects.equals(applyReason, that.applyReason) && Objects.equals(apply_Reason, this.apply_Reason) &&
Objects.equals(statusNo, that.statusNo) && Objects.equals(status_No, this.status_No);
Objects.equals(cardSerial, that.cardSerial);
} }
@Override @Override
public int hashCode() { 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; ...@@ -7,247 +7,225 @@ import java.util.Objects;
@Entity @Entity
@Table(name = "PROD_GROUP_T", schema = "PROD_DBA", catalog = "") @Table(name = "PROD_GROUP_T", schema = "PROD_DBA", catalog = "")
public class ProdGroupTEntity { public class ProdGroupTEntity {
private String groupNo; private String group_No;
private Byte validCount; private Byte valid_Count;
private Byte invalidCount; private Byte invalid_Count;
private Time submitDate; private Time submit_Date;
private String submitCode; private String submit_Code;
private Time exportDate; private Time export_Date;
private String exportCode; private String export_Code;
private String downloadFlag; private String download_Flag;
private Byte downloadCount; private Byte download_Count;
private Time downloadDate; private Time download_Date;
private String ewriteFlag; private String ewrite_Flag;
private Byte ewriteCount; private Byte ewrite_Count;
private Time ewriteDate; private Time ewrite_Date;
private String checkFlag; private String check_Flag;
private Byte checkCount; private Byte check_Count;
private Time checkDate; private Time check_Date;
private String sendFlag; private String send_Flag;
private Byte sendCount; private Byte send_Count;
private Time sendDate; private Time send_Date;
private String moveFlag; private String move_Flag;
private Byte moveCount; private Byte move_Count;
private Time moveDate; private Time move_Date;
@Id @Id
@Column(name = "GROUP_NO", nullable = false, length = 10) @Column(name = "GROUP_NO", nullable = false, length = 10)
public String getGroupNo() { public String getGroup_No() {
return groupNo; return group_No;
} }
public void setGroupNo(String groupNo) { public void setGroup_No(String group_No) {
this.groupNo = groupNo; this.group_No = group_No;
} }
@Basic @Basic
@Column(name = "VALID_COUNT", nullable = true, precision = 0) @Column(name = "VALID_COUNT", nullable = true, precision = 0)
public Byte getValidCount() { public Byte getValid_Count() {
return validCount; return valid_Count;
} }
public void setValidCount(Byte validCount) { public void setValid_Count(Byte valid_Count) {
this.validCount = validCount; this.valid_Count = valid_Count;
} }
@Basic @Basic
@Column(name = "INVALID_COUNT", nullable = true, precision = 0) @Column(name = "INVALID_COUNT", nullable = true, precision = 0)
public Byte getInvalidCount() { public Byte getInvalid_Count() {
return invalidCount; return invalid_Count;
} }
public void setInvalidCount(Byte invalidCount) { public void setInvalid_Count(Byte invalid_Count) {
this.invalidCount = invalidCount; this.invalid_Count = invalid_Count;
} }
@Basic @Basic
@Column(name = "SUBMIT_DATE", nullable = true) @Column(name = "SUBMIT_DATE", nullable = true)
public Time getSubmitDate() { public Time getSubmit_Date() {
return submitDate; return submit_Date;
} }
public void setSubmitDate(Time submitDate) { public void setSubmit_Date(Time submit_Date) {
this.submitDate = submitDate; this.submit_Date = submit_Date;
} }
@Basic @Basic
@Column(name = "SUBMIT_CODE", nullable = true, length = 8) @Column(name = "SUBMIT_CODE", nullable = true, length = 8)
public String getSubmitCode() { public String getSubmit_Code() {
return submitCode; return submit_Code;
} }
public void setSubmitCode(String submitCode) { public void setSubmit_Code(String submit_Code) {
this.submitCode = submitCode; this.submit_Code = submit_Code;
} }
@Basic @Basic
@Column(name = "EXPORT_DATE", nullable = true) @Column(name = "EXPORT_DATE", nullable = true)
public Time getExportDate() { public Time getExport_Date() {
return exportDate; return export_Date;
} }
public void setExportDate(Time exportDate) { public void setExport_Date(Time export_Date) {
this.exportDate = exportDate; this.export_Date = export_Date;
} }
@Basic @Basic
@Column(name = "EXPORT_CODE", nullable = true, length = 8) @Column(name = "EXPORT_CODE", nullable = true, length = 8)
public String getExportCode() { public String getExport_Code() {
return exportCode; return export_Code;
} }
public void setExportCode(String exportCode) { public void setExport_Code(String export_Code) {
this.exportCode = exportCode; this.export_Code = export_Code;
} }
@Basic @Basic
@Column(name = "DOWNLOAD_FLAG", nullable = true, length = 1) @Column(name = "DOWNLOAD_FLAG", nullable = true, length = 1)
public String getDownloadFlag() { public String getDownload_Flag() {
return downloadFlag; return download_Flag;
} }
public void setDownloadFlag(String downloadFlag) { public void setDownload_Flag(String download_Flag) {
this.downloadFlag = downloadFlag; this.download_Flag = download_Flag;
} }
@Basic @Basic
@Column(name = "DOWNLOAD_COUNT", nullable = true, precision = 0) @Column(name = "DOWNLOAD_COUNT", nullable = true, precision = 0)
public Byte getDownloadCount() { public Byte getDownload_Count() {
return downloadCount; return download_Count;
} }
public void setDownloadCount(Byte downloadCount) { public void setDownload_Count(Byte download_Count) {
this.downloadCount = downloadCount; this.download_Count = download_Count;
} }
@Basic @Basic
@Column(name = "DOWNLOAD_DATE", nullable = true) @Column(name = "DOWNLOAD_DATE", nullable = true)
public Time getDownloadDate() { public Time getDownload_Date() {
return downloadDate; return download_Date;
} }
public void setDownloadDate(Time downloadDate) { public void setDownload_Date(Time download_Date) {
this.downloadDate = downloadDate; this.download_Date = download_Date;
} }
@Basic @Basic
@Column(name = "EWRITE_FLAG", nullable = true, length = 1) @Column(name = "EWRITE_FLAG", nullable = true, length = 1)
public String getEwriteFlag() { public String getEwrite_Flag() {
return ewriteFlag; return ewrite_Flag;
} }
public void setEwriteFlag(String ewriteFlag) { public void setEwrite_Flag(String ewrite_Flag) {
this.ewriteFlag = ewriteFlag; this.ewrite_Flag = ewrite_Flag;
} }
@Basic @Basic
@Column(name = "EWRITE_COUNT", nullable = true, precision = 0) @Column(name = "EWRITE_COUNT", nullable = true, precision = 0)
public Byte getEwriteCount() { public Byte getEwrite_Count() {
return ewriteCount; return ewrite_Count;
} }
public void setEwriteCount(Byte ewriteCount) { public void setEwrite_Count(Byte ewrite_Count) {
this.ewriteCount = ewriteCount; this.ewrite_Count = ewrite_Count;
} }
@Basic @Basic
@Column(name = "EWRITE_DATE", nullable = true) @Column(name = "EWRITE_DATE", nullable = true)
public Time getEwriteDate() { public Time getEwrite_Date() {
return ewriteDate; return ewrite_Date;
} }
public void setEwriteDate(Time ewriteDate) { public void setEwrite_Date(Time ewrite_Date) {
this.ewriteDate = ewriteDate; this.ewrite_Date = ewrite_Date;
} }
@Basic @Basic
@Column(name = "CHECK_FLAG", nullable = true, length = 1) @Column(name = "CHECK_FLAG", nullable = true, length = 1)
public String getCheckFlag() { public String getCheck_Flag() {
return checkFlag; return check_Flag;
} }
public void setCheckFlag(String checkFlag) { public void setCheck_Flag(String check_Flag) {
this.checkFlag = checkFlag; this.check_Flag = check_Flag;
} }
@Basic @Basic
@Column(name = "CHECK_COUNT", nullable = true, precision = 0) @Column(name = "CHECK_COUNT", nullable = true, precision = 0)
public Byte getCheckCount() { public Byte getCheck_Count() {
return checkCount; return check_Count;
} }
public void setCheckCount(Byte checkCount) { public void setCheck_Count(Byte check_Count) {
this.checkCount = checkCount; this.check_Count = check_Count;
} }
@Basic @Basic
@Column(name = "CHECK_DATE", nullable = true) @Column(name = "CHECK_DATE", nullable = true)
public Time getCheckDate() { public Time getCheck_Date() {
return checkDate; return check_Date;
} }
public void setCheckDate(Time checkDate) { public void setCheck_Date(Time check_Date) {
this.checkDate = checkDate; this.check_Date = check_Date;
} }
@Basic @Basic
@Column(name = "SEND_FLAG", nullable = true, length = 1) @Column(name = "SEND_FLAG", nullable = true, length = 1)
public String getSendFlag() { public String getSend_Flag() {
return sendFlag; return send_Flag;
} }
public void setSendFlag(String sendFlag) { public void setSend_Flag(String send_Flag) {
this.sendFlag = sendFlag; this.send_Flag = send_Flag;
} }
@Basic @Basic
@Column(name = "SEND_COUNT", nullable = true, precision = 0) @Column(name = "SEND_COUNT", nullable = true, precision = 0)
public Byte getSendCount() { public Byte getSend_Count() {
return sendCount; return send_Count;
} }
public void setSendCount(Byte sendCount) { public void setSend_Count(Byte send_Count) {
this.sendCount = sendCount; this.send_Count = send_Count;
} }
@Basic @Basic
@Column(name = "SEND_DATE", nullable = true) @Column(name = "SEND_DATE", nullable = true)
public Time getSendDate() { public Time getSend_Date() {
return sendDate; return send_Date;
} }
public void setSendDate(Time sendDate) { public void setSend_Date(Time send_Date) {
this.sendDate = sendDate; this.send_Date = send_Date;
} }
@Basic @Basic
@Column(name = "MOVE_FLAG", nullable = true, length = 1) @Column(name = "MOVE_FLAG", nullable = true, length = 1)
public String getMoveFlag() { public String getMove_Flag() {
return moveFlag; return move_Flag;
} }
public void setMoveFlag(String moveFlag) { public void setMove_Flag(String move_Flag) {
this.moveFlag = moveFlag; this.move_Flag = move_Flag;
} }
@Basic @Basic
@Column(name = "MOVE_COUNT", nullable = true, precision = 0) @Column(name = "MOVE_COUNT", nullable = true, precision = 0)
public Byte getMoveCount() { public Byte getMove_Count() {
return moveCount; return move_Count;
} }
public void setMoveCount(Byte moveCount) { public void setMove_Count(Byte move_Count) {
this.moveCount = moveCount; this.move_Count = move_Count;
} }
@Basic @Basic
@Column(name = "MOVE_DATE", nullable = true) @Column(name = "MOVE_DATE", nullable = true)
public Time getMoveDate() { public Time getMove_Date() {
return moveDate; return move_Date;
} }
public void setMoveDate(Time moveDate) { public void setMove_Date(Time move_Date) {
this.moveDate = moveDate; this.move_Date = move_Date;
} }
@Override @Override
...@@ -255,32 +233,32 @@ public class ProdGroupTEntity { ...@@ -255,32 +233,32 @@ public class ProdGroupTEntity {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
ProdGroupTEntity that = (ProdGroupTEntity) o; ProdGroupTEntity that = (ProdGroupTEntity) o;
return Objects.equals(groupNo, that.groupNo) && return Objects.equals(group_No, that.group_No) &&
Objects.equals(validCount, that.validCount) && Objects.equals(valid_Count, that.valid_Count) &&
Objects.equals(invalidCount, that.invalidCount) && Objects.equals(invalid_Count, that.invalid_Count) &&
Objects.equals(submitDate, that.submitDate) && Objects.equals(submit_Date, that.submit_Date) &&
Objects.equals(submitCode, that.submitCode) && Objects.equals(submit_Code, that.submit_Code) &&
Objects.equals(exportDate, that.exportDate) && Objects.equals(export_Date, that.export_Date) &&
Objects.equals(exportCode, that.exportCode) && Objects.equals(export_Code, that.export_Code) &&
Objects.equals(downloadFlag, that.downloadFlag) && Objects.equals(download_Flag, that.download_Flag) &&
Objects.equals(downloadCount, that.downloadCount) && Objects.equals(download_Count, that.download_Count) &&
Objects.equals(downloadDate, that.downloadDate) && Objects.equals(download_Date, that.download_Date) &&
Objects.equals(ewriteFlag, that.ewriteFlag) && Objects.equals(ewrite_Flag, that.ewrite_Flag) &&
Objects.equals(ewriteCount, that.ewriteCount) && Objects.equals(ewrite_Count, that.ewrite_Count) &&
Objects.equals(ewriteDate, that.ewriteDate) && Objects.equals(ewrite_Date, that.ewrite_Date) &&
Objects.equals(checkFlag, that.checkFlag) && Objects.equals(check_Flag, that.check_Flag) &&
Objects.equals(checkCount, that.checkCount) && Objects.equals(check_Count, that.check_Count) &&
Objects.equals(checkDate, that.checkDate) && Objects.equals(check_Date, that.check_Date) &&
Objects.equals(sendFlag, that.sendFlag) && Objects.equals(send_Flag, that.send_Flag) &&
Objects.equals(sendCount, that.sendCount) && Objects.equals(send_Count, that.send_Count) &&
Objects.equals(sendDate, that.sendDate) && Objects.equals(send_Date, that.send_Date) &&
Objects.equals(moveFlag, that.moveFlag) && Objects.equals(move_Flag, that.move_Flag) &&
Objects.equals(moveCount, that.moveCount) && Objects.equals(move_Count, that.move_Count) &&
Objects.equals(moveDate, that.moveDate); Objects.equals(move_Date, that.move_Date);
} }
@Override @Override
public int hashCode() { 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; ...@@ -7,172 +7,158 @@ import java.util.Objects;
@Entity @Entity
@Table(name = "PROD_TRACE_T", schema = "PROD_DBA", catalog = "") @Table(name = "PROD_TRACE_T", schema = "PROD_DBA", catalog = "")
public class ProdTraceTEntity { public class ProdTraceTEntity {
private String acceptNo; private String accept_No;
private String photoerNo; private String photoer_No;
private Time photoDate; private Time photo_Date;
private String exportNo; private String export_No;
private Time exportDate; private Time export_Date;
private String downloadNo; private String download_No;
private Time downloadDate; private Time download_Date;
private String electricWriterNo; private String electric_Writer_No;
private Time electricWriteDate; private Time electric_Write_Date;
private String checkerNo; private String checker_No;
private Time checkDate; private Time check_Date;
private String moverNo; private String mover_No;
private Time moveDate; private Time move_Date;
@Id @Id
@Column(name = "ACCEPT_NO", nullable = false, length = 12) @Column(name = "ACCEPT_NO", nullable = false, length = 12)
public String getAcceptNo() { public String getAccept_No() {
return acceptNo; return accept_No;
} }
public void setAcceptNo(String acceptNo) { public void setAccept_No(String accept_No) {
this.acceptNo = acceptNo; this.accept_No = accept_No;
} }
@Basic @Basic
@Column(name = "PHOTOER_NO", nullable = true, length = 8) @Column(name = "PHOTOER_NO", nullable = true, length = 8)
public String getPhotoerNo() { public String getPhotoer_No() {
return photoerNo; return photoer_No;
} }
public void setPhotoerNo(String photoerNo) { public void setPhotoer_No(String photoer_No) {
this.photoerNo = photoerNo; this.photoer_No = photoer_No;
} }
@Basic @Basic
@Column(name = "PHOTO_DATE", nullable = true) @Column(name = "PHOTO_DATE", nullable = true)
public Time getPhotoDate() { public Time getPhoto_Date() {
return photoDate; return photo_Date;
} }
public void setPhotoDate(Time photoDate) { public void setPhoto_Date(Time photo_Date) {
this.photoDate = photoDate; this.photo_Date = photo_Date;
} }
@Basic @Basic
@Column(name = "EXPORT_NO", nullable = true, length = 8) @Column(name = "EXPORT_NO", nullable = true, length = 8)
public String getExportNo() { public String getExport_No() {
return exportNo; return export_No;
} }
public void setExportNo(String exportNo) { public void setExport_No(String export_No) {
this.exportNo = exportNo; this.export_No = export_No;
} }
@Basic @Basic
@Column(name = "EXPORT_DATE", nullable = true) @Column(name = "EXPORT_DATE", nullable = true)
public Time getExportDate() { public Time getExport_Date() {
return exportDate; return export_Date;
} }
public void setExportDate(Time exportDate) { public void setExport_Date(Time export_Date) {
this.exportDate = exportDate; this.export_Date = export_Date;
} }
@Basic @Basic
@Column(name = "DOWNLOAD_NO", nullable = true, length = 8) @Column(name = "DOWNLOAD_NO", nullable = true, length = 8)
public String getDownloadNo() { public String getDownload_No() {
return downloadNo; return download_No;
} }
public void setDownloadNo(String downloadNo) { public void setDownload_No(String download_No) {
this.downloadNo = downloadNo; this.download_No = download_No;
} }
@Basic @Basic
@Column(name = "DOWNLOAD_DATE", nullable = true) @Column(name = "DOWNLOAD_DATE", nullable = true)
public Time getDownloadDate() { public Time getDownload_Date() {
return downloadDate; return download_Date;
} }
public void setDownloadDate(Time downloadDate) { public void setDownload_Date(Time download_Date) {
this.downloadDate = downloadDate; this.download_Date = download_Date;
} }
@Basic @Basic
@Column(name = "ELECTRIC_WRITER_NO", nullable = true, length = 8) @Column(name = "ELECTRIC_WRITER_NO", nullable = true, length = 8)
public String getElectricWriterNo() { public String getElectric_Writer_No() {
return electricWriterNo; return electric_Writer_No;
} }
public void setElectricWriterNo(String electricWriterNo) { public void setElectric_Writer_No(String electric_Writer_No) {
this.electricWriterNo = electricWriterNo; this.electric_Writer_No = electric_Writer_No;
} }
@Basic @Basic
@Column(name = "ELECTRIC_WRITE_DATE", nullable = true) @Column(name = "ELECTRIC_WRITE_DATE", nullable = true)
public Time getElectricWriteDate() { public Time getElectric_Write_Date() {
return electricWriteDate; return electric_Write_Date;
} }
public void setElectricWriteDate(Time electricWriteDate) { public void setElectric_Write_Date(Time electric_Write_Date) {
this.electricWriteDate = electricWriteDate; this.electric_Write_Date = electric_Write_Date;
} }
@Basic @Basic
@Column(name = "CHECKER_NO", nullable = true, length = 8) @Column(name = "CHECKER_NO", nullable = true, length = 8)
public String getCheckerNo() { public String getChecker_No() {
return checkerNo; return checker_No;
} }
public void setCheckerNo(String checkerNo) { public void setChecker_No(String checker_No) {
this.checkerNo = checkerNo; this.checker_No = checker_No;
} }
@Basic @Basic
@Column(name = "CHECK_DATE", nullable = true) @Column(name = "CHECK_DATE", nullable = true)
public Time getCheckDate() { public Time getCheck_Date() {
return checkDate; return check_Date;
} }
public void setCheckDate(Time checkDate) { public void setCheck_Date(Time check_Date) {
this.checkDate = checkDate; this.check_Date = check_Date;
} }
@Basic @Basic
@Column(name = "MOVER_NO", nullable = true, length = 8) @Column(name = "MOVER_NO", nullable = true, length = 8)
public String getMoverNo() { public String getMover_No() {
return moverNo; return mover_No;
} }
public void setMoverNo(String moverNo) { public void setMover_No(String mover_No) {
this.moverNo = moverNo; this.mover_No = mover_No;
} }
@Basic @Basic
@Column(name = "MOVE_DATE", nullable = true) @Column(name = "MOVE_DATE", nullable = true)
public Time getMoveDate() { public Time getMove_Date() {
return moveDate; return move_Date;
} }
public void setMoveDate(Time moveDate) { public void setMove_Date(Time move_Date) {
this.moveDate = moveDate; this.move_Date = move_Date;
} }
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
ProdTraceTEntity that = (ProdTraceTEntity) o; ProdTraceTEntity that = (ProdTraceTEntity) o;
return Objects.equals(acceptNo, that.acceptNo) && return Objects.equals(accept_No, that.accept_No) &&
Objects.equals(photoerNo, that.photoerNo) && Objects.equals(photoer_No, that.photoer_No) &&
Objects.equals(photoDate, that.photoDate) && Objects.equals(photo_Date, that.photo_Date) &&
Objects.equals(exportNo, that.exportNo) && Objects.equals(export_No, that.export_No) &&
Objects.equals(exportDate, that.exportDate) && Objects.equals(export_Date, that.export_Date) &&
Objects.equals(downloadNo, that.downloadNo) && Objects.equals(download_No, that.download_No) &&
Objects.equals(downloadDate, that.downloadDate) && Objects.equals(download_Date, that.download_Date) &&
Objects.equals(electricWriterNo, that.electricWriterNo) && Objects.equals(electric_Writer_No, that.electric_Writer_No) &&
Objects.equals(electricWriteDate, that.electricWriteDate) && Objects.equals(electric_Write_Date, that.electric_Write_Date) &&
Objects.equals(checkerNo, that.checkerNo) && Objects.equals(checker_No, that.checker_No) &&
Objects.equals(checkDate, that.checkDate) && Objects.equals(check_Date, that.check_Date) &&
Objects.equals(moverNo, that.moverNo) && Objects.equals(mover_No, that.mover_No) &&
Objects.equals(moveDate, that.moveDate); Objects.equals(move_Date, that.move_Date);
} }
@Override @Override
public int hashCode() { 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; package com.yxproject.start.mapper;
import com.yxproject.start.entity.ProductionTaskListEntity; 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.Mapper;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.UpdateProvider;
import org.springframework.data.repository.query.Param;
import java.util.List; import java.util.List;
/** /**
* @author Administratorid * Created by zhangyusheng on 2018/10/13 9:36
*/ */
@Mapper @Mapper
public interface ProductionTaskListMapper { 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); 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 insertProductionTaskListEntity(ProductionTaskListEntity productionTaskListEntity);
public int findProductionTaskSeqNexvalue();
public int updateProductionTask(ProductionTaskListEntity productionTaskListEntity); 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 { ...@@ -13,4 +13,8 @@ public interface UtilMapper {
* 查询任务单序列值 * 查询任务单序列值
*/ */
public int findProductionTaskListSequenceNextValue(); public int findProductionTaskListSequenceNextValue();
/**
* 查询组号信息序列值
*/
public int findGroupInfoSequenceNextValue();
} }
src/main/java/com/yxproject/start/service/ProductionTaskListService.java
View file @ 2b873e47
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.GroupinfoEntity;
import com.yxproject.start.entity.ProductionTaskListEntity; import com.yxproject.start.entity.ProductionTaskListEntity;
import java.util.List; import java.util.List;
...@@ -9,7 +10,10 @@ public interface ProductionTaskListService { ...@@ -9,7 +10,10 @@ public interface ProductionTaskListService {
public List<ProductionTaskListEntity> findProductionTaskListEntityByID(String id); public List<ProductionTaskListEntity> findProductionTaskListEntityByID(String id);
public int updateProductionTask(ProductionTaskListEntity map); 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 { ...@@ -5,6 +5,7 @@ public interface UtilService {
public int findProductionTaskListSequenceNextValue(); 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; package com.yxproject.start.service.impl;
import com.yxproject.start.entity.GroupinfoEntity;
import com.yxproject.start.entity.ProductionTaskListEntity; 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 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; 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.List;
import java.util.Map; import java.util.Map;
...@@ -19,20 +26,280 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService ...@@ -19,20 +26,280 @@ public class ProductionTaskListServiceImpl implements ProductionTaskListService
@Autowired @Autowired
public ProductionTaskListMapper productionTaskListMapper; public ProductionTaskListMapper productionTaskListMapper;
@Autowired
public GroupinfoMapper groupinfoMapper;
@Autowired
public UtilMapper utilMapper;
@Autowired
public AccCardTMapper accCardTMapper;
@Autowired
public ProdCardTMapper prodCardTMapper;
/**
* 查询任务单
* 通过任务单ID
* @param id
* @return
*/
@Override @Override
public List<ProductionTaskListEntity> findProductionTaskListEntityByID(String id) { public List<ProductionTaskListEntity> findProductionTaskListEntityByID(String id) {
return productionTaskListMapper.findProductionTaskListEntity(id); return productionTaskListMapper.findProductionTaskListEntity(id);
} }
/**
* 更新任务单信息
* 通过新的任务单信息
* @param productionTaskListEntity
* @return
*/
@Override @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 @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;
}
return productionTaskListMapper.insertProductionTaskListEntity(productionTaskListEntity); /**
* 添加快证
* 包含已经下发的任务单、没有下发的任务单
* @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 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; 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.mapper.UtilMapper;
import com.yxproject.start.service.ProductionTaskListService;
import com.yxproject.start.service.UtilService; import com.yxproject.start.service.UtilService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* @author Administrator * @author Administrator
*/ */
...@@ -22,4 +17,9 @@ public class UtilServiceImpl implements UtilService { ...@@ -22,4 +17,9 @@ public class UtilServiceImpl implements UtilService {
return utilMapper.findProductionTaskListSequenceNextValue(); 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 @@ ...@@ -28,7 +28,7 @@
<insert id="insertProductionTaskListEntity" parameterType="com.yxproject.start.entity.ProductionTaskListEntity"> <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} values (#{productionTaskListId}
<if test="makeType != null">,#{makeType}</if> <if test="makeType != null">,#{makeType}</if>
<if test="makeType == null">,null </if> <if test="makeType == null">,null </if>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</insert> </insert>
<update id="updateProductionTask" parameterType="com.yxproject.start.entity.ProductionTaskListEntity"> <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="oldMakeType != null">,OLD_MAKE_TYPE =#{oldMakeType}</if>
<if test="makeType != null">,MAKE_TYPE =#{makeType}</if> <if test="makeType != null">,MAKE_TYPE =#{makeType}</if>
<if test="citycode != null">,CITYCODE =#{citycode}</if> <if test="citycode != null">,CITYCODE =#{citycode}</if>
...@@ -85,4 +85,9 @@ ...@@ -85,4 +85,9 @@
where PRODUCTION_TASK_LIST_ID=#{productionTaskListId} where PRODUCTION_TASK_LIST_ID=#{productionTaskListId}
</update> </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> </mapper>
\ No newline at end of file
src/main/resources/mapper/SysPermissionMapper.xml
View file @ 2b873e47
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<result column="available" property="available"/> <result column="available" property="available"/>
</resultMap> </resultMap>
<insert id="addPermissionByMap" parameterType="com.yxproject.start.entity.SysPermission"> <!--<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 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>-->
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/SystemUserMapper.xml
View file @ 2b873e47
...@@ -36,13 +36,13 @@ ...@@ -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 into USER_INFO (`u_id`,`username`,`name`,`password`,`salt`,`state`) VALUES (USER_INFO_seq.nextval, 'admin', '管理员', 'd3c59d25033dbf980d29554025c23a75', '8d78869f470951332959580424d4bf4f', 0)
</insert> </insert>
<update id = "delUserInfo" parameterType = "int" > <!--<update id = "delUserInfo" parameterType = "int" >-->
update user_info set STATE = 1 where u_id =#{uId} <!--update user_info set STATE = 1 where u_id =#{uId}-->
</update> <!--</update>-->
<update id = "updateUserInfo" parameterType = "map" > <!--<update id = "updateUserInfo" parameterType = "map" >-->
update user_info set username =#{username},name =#{name},password =#{password} where u_id =#{uId} <!--update user_info set username =#{username},name =#{name},password =#{password} where u_id =#{uId}-->
</update> <!--</update>-->
<!--<select id="findUserByUsername" resultMap="UserRoleMenuMap" parameterType="string">--> <!--<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,--> <!--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