diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java index 30792bb6..8c8e5155 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java @@ -1,5 +1,8 @@ package com.foreverwin.mesnac.anomaly.controller; +import com.foreverwin.mesnac.anomaly.utils.DateReportUtils; +import com.foreverwin.mesnac.common.util.DataUtils; +import com.foreverwin.mesnac.common.util.DateUtil; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.modular.core.util.R; import com.foreverwin.modular.core.util.FrontPage; @@ -12,9 +15,12 @@ import org.springframework.web.bind.annotation.*; import com.foreverwin.mesnac.anomaly.service.TemporaryFixService; import com.foreverwin.mesnac.anomaly.model.TemporaryFix; +import org.springframework.web.multipart.MultipartFile; +import javax.websocket.server.PathParam; import java.time.LocalDateTime; import java.util.List; +import java.util.logging.Handler; /** * @@ -62,37 +68,26 @@ public class TemporaryFixController { * @return */ @GetMapping("/page") - public R page(FrontPage frontPage, TemporaryFix temporaryFix){ + public R page(FrontPage frontPage, TemporaryFix temporaryFix,String startDate,String endDate,String createdTimeNew){ IPage result; QueryWrapper queryWrapper = new QueryWrapper<>(); - //queryWrapper.setEntity(temporaryFix); - /*if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { - //TODO modify global query - queryWrapper.lambda().and(wrapper -> wrapper - .like(TemporaryFix::getHandle, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getSite, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getEntrustUnit, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getDutyPerson, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getDutyReason, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getProjectNumber, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getQualityReviewNumber, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getWorkContactNumber, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getMaterialCode, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getMaterialName, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getMapNo, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getAmount, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getSingleWorkHours, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getTotalWorkHours, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getMachineHours, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getOperator, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getUseDevice, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getDeviceType, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getCostCenter, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getCreatedBy, frontPage.getGlobalQuery()) - .or().like(TemporaryFix::getUpdatedBy, frontPage.getGlobalQuery()) - ); - }*/ - queryWrapper.eq(!StringUtil.isBlank(temporaryFix.getEntrustUnit()),"ENTRUST_UNIT",temporaryFix.getEntrustUnit()); + + queryWrapper.eq(!StringUtil.isBlank(temporaryFix.getEntrustUnit()),"ENTRUST_UNIT",temporaryFix.getEntrustUnit()) + .like(!StringUtil.isBlank(temporaryFix.getDutyPerson()),"DUTY_PERSON",temporaryFix.getDutyPerson()) + .like(!StringUtil.isBlank(temporaryFix.getProjectNumber()),"PROJECT_NUMBER",temporaryFix.getProjectNumber()) + .like(!StringUtil.isBlank(temporaryFix.getQualityReviewNumber()),"QUALITY_REVIEW_NUMBER",temporaryFix.getQualityReviewNumber()) + .like(!StringUtil.isBlank(temporaryFix.getWorkContactNumber()),"WORK_CONTACT_NUMBER",temporaryFix.getWorkContactNumber()) + .like(!StringUtil.isBlank(temporaryFix.getMaterialCode()),"MATERIAL_CODE",temporaryFix.getMaterialCode()) + .like(!StringUtil.isBlank(temporaryFix.getMaterialName()),"MATERIAL_NAME",temporaryFix.getMaterialName()) + .like(!StringUtil.isBlank(temporaryFix.getMapNo()),"MAP_NO",temporaryFix.getMapNo()) + .like(!StringUtil.isBlank(temporaryFix.getOperator()),"OPERATOR",temporaryFix.getOperator()) + .like(!StringUtil.isBlank(temporaryFix.getUseDevice()),"USE_DEVICE",temporaryFix.getUseDevice()) + .eq(!StringUtil.isBlank(temporaryFix.getUploadCenter()),"UPLOAD_CENTER",temporaryFix.getUploadCenter()) + .ge(!StringUtil.isBlank(startDate),"ENTRUST_DATE", DateReportUtils.stringToDate(startDate + " 00:00:00","yyyy-MM-dd HH:mm:ss")) + .le(!StringUtil.isBlank(endDate),"ENTRUST_DATE",DateReportUtils.stringToDate(endDate + " 23:59:59","yyyy-MM-dd HH:mm:ss")) + .ge(!StringUtil.isBlank(createdTimeNew),"ENTRUST_DATE",DateReportUtils.stringToDate(createdTimeNew + " 00:00:00","yyyy-MM-dd HH:mm:ss")) + .le(!StringUtil.isBlank(createdTimeNew),"ENTRUST_DATE",DateReportUtils.stringToDate(createdTimeNew + " 23:59:59","yyyy-MM-dd HH:mm:ss")) + ; result = temporaryFixService.page(frontPage.getPagePlus(), queryWrapper); return R.ok(result); @@ -116,6 +111,7 @@ public class TemporaryFixController { temporaryFix.setUpdatedBy(user); temporaryFix.setUpdatedTime(now); temporaryFix.setTotalWorkHours(String.valueOf(Float.valueOf(temporaryFix.getAmount()) * Float.valueOf(temporaryFix.getSingleWorkHours()))); + boolean result = temporaryFixService.save(temporaryFix); return R.ok(result); } @@ -134,6 +130,42 @@ public class TemporaryFixController { return R.ok(result); } + +/* + @PostMapping("/import") + public String importFile(@PathParam("fileType") String fileType, @PathParam("site") String site, @PathParam("handleType") final String handleType, @PathParam("mode") final String mode, @PathParam("user") String user, @RequestParam("file") MultipartFile multipartFile) { + ImportRequest importRequest = new ImportRequest(); + importRequest.setFileType(fileType); + importRequest.setSite(site); + importRequest.setUser(user); + importRequest.setMode(mode); + importRequest.setMasterType(handleType); + //----------------------------------------------------------------------------------------------------------------------------------------- + try { + Handler handler = HandlerFactory.getHandler(masterType); + String transInfo = handler.importFile(site, inputStream, fileType, mode); + String transInfo = masterDataImportService.importFile(multipartFile, importRequest); + return new APResult().getResult(0, transInfo, transInfo); + } catch (Exception e) { + e.printStackTrace(); + return new APResult().getResult(9999, e.getMessage(), e.getMessage()); + } + } + @PostMapping("/importData") + @ResponseBody + public R importData(MultipartFile file, boolean updateSupport) throws Exception + { + + ExcelUtil util = new ExcelUtil(TemporaryFix.class); + List temporaryFixList = util.importExcel(file.getInputStream()); + //String operName = ShiroUtils.getSysUser().getLoginName(); + //String message = agvInfoService.importagvInfo(agvInfoList, updateSupport, operName); + + boolean result = temporaryFixService.saveBatch(temporaryFixList); + return R.ok(result); + + }*/ + /** * 根据id删除对象 * @param id 实体ID diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/TemporaryFix.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/TemporaryFix.java index ed42199a..dc7bf727 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/TemporaryFix.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/TemporaryFix.java @@ -2,6 +2,7 @@ package com.foreverwin.mesnac.anomaly.model; import java.io.Serializable; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.annotation.TableId; @@ -9,7 +10,10 @@ import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.foreverwin.mesnac.common.model.ExcelColumn; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** *

@@ -24,126 +28,191 @@ import lombok.Data; @Data public class TemporaryFix extends Model { - private static final long serialVersionUID = 1L; - /** * 主键 */ @TableId(value = "HANDLE", type = IdType.INPUT) + @ExcelColumn(value = "handle") private String handle; /** * 场地 */ @TableField("SITE") + @ExcelColumn(value = "site") private String site; /** * 委托日期 */ @TableField("ENTRUST_DATE") + @ExcelColumn(value = "委托日期") + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime entrustDate; /** * 委托/联系单位 */ @TableField("ENTRUST_UNIT") + @ExcelColumn(value = "委托/联系单位") private String entrustUnit; /** * 责任主体/人 */ @TableField("DUTY_PERSON") + @ExcelColumn(value = "责任主体/人") private String dutyPerson; /** * 责任原因 */ @TableField("DUTY_REASON") + @ExcelColumn(value = "责任原因") private String dutyReason; /** * 项目号 */ @TableField("PROJECT_NUMBER") + @ExcelColumn(value = "项目号") private String projectNumber; /** * 质量评审单号 */ @TableField("QUALITY_REVIEW_NUMBER") + @ExcelColumn(value = "质量评审单号") private String qualityReviewNumber; /** * 工作联络单号 */ @TableField("WORK_CONTACT_NUMBER") + @ExcelColumn(value = "工作联络单号") private String workContactNumber; /** * 物料编码 */ @TableField("MATERIAL_CODE") + @ExcelColumn(value = "物料编码") private String materialCode; /** * 物料名称 */ @TableField("MATERIAL_NAME") + @ExcelColumn(value = "物料名称") private String materialName; /** * 图号 */ @TableField("MAP_NO") + @ExcelColumn(value = "图号") private String mapNo; /** * 数量 */ @TableField("AMOUNT") + @ExcelColumn(value = "数量") private String amount; /** * 单件工时 */ @TableField("SINGLE_WORK_HOURS") + @ExcelColumn(value = "单件工时") private String singleWorkHours; /** * 总工时 */ @TableField("TOTAL_WORK_HOURS") + @ExcelColumn(value = "总工时") private String totalWorkHours; /** * 机时 */ @TableField("MACHINE_HOURS") + @ExcelColumn(value = "机时") private String machineHours; /** * 操作者 */ @TableField("OPERATOR") + @ExcelColumn(value = "操作者") private String operator; /** * 使用设备 */ @TableField("USE_DEVICE") + @ExcelColumn(value = "使用设备") private String useDevice; /** * 设备型号 */ @TableField("DEVICE_TYPE") + @ExcelColumn(value = "设备型号") private String deviceType; /** * 成本中心 */ @TableField("COST_CENTER") + @ExcelColumn(value = "成本中心") private String costCenter; + + /** + * 上传车间 + */ + @TableField("UPLOAD_CENTER") + @ExcelColumn(value = "上传车间") + private String uploadCenter; + /** + * 上传人员 + */ + @TableField("UPLOAD_USER") + @ExcelColumn(value = "上传人员") + private String uploadUser; + /** + * 分类 + */ + @TableField("CLASSIFY") + @ExcelColumn(value = "分类") + private String classify; + /** + * 责任分类 + */ + @TableField("DUTY_CLASSIFY") + @ExcelColumn(value = "责任分类") + private String dutyClassify; + /** + * 用工属性 + */ + @TableField("EMPLOY_PROPERTY") + @ExcelColumn(value = "用工属性") + private String employProperty; + /** + * 工作中心代码 + */ + @TableField("CENTER_CODE") + @ExcelColumn(value = "工作中心代码") + private String centerCode; + /** * 创建人 */ @TableField("CREATED_BY") + @ExcelColumn(value = "createdBy") private String createdBy; /** * 创建时间 */ @TableField("CREATED_TIME") + @ExcelColumn(value = "createdTime") private LocalDateTime createdTime; /** * 更新人 */ @TableField("UPDATED_BY") + @ExcelColumn(value = "updatedBy") private String updatedBy; /** * 更新时间 */ @TableField("UPDATED_TIME") + @ExcelColumn(value = "updatedTime") private LocalDateTime updatedTime; + + @TableField(exist = false) + @ExcelColumn(value = "SEQ") + private Integer SEQ; } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/TemporaryFixService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/TemporaryFixService.java index 8208c060..0d7c6fbd 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/TemporaryFixService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/TemporaryFixService.java @@ -25,4 +25,6 @@ public interface TemporaryFixService extends IService { IPage selectPage(FrontPage frontPage, TemporaryFix temporaryFix); List selectList(TemporaryFix temporaryFix); + + List temporaryFixImportFile(List temporaryFixList); } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/TemporaryFixServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/TemporaryFixServiceImpl.java index 5578fd51..5cf49819 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/TemporaryFixServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/TemporaryFixServiceImpl.java @@ -1,5 +1,7 @@ package com.foreverwin.mesnac.anomaly.service.impl; +import com.foreverwin.mesnac.common.util.StringUtil; +import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -11,7 +13,9 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.List; + /** *

* 临时修复表 服务实现类 @@ -42,5 +46,33 @@ public class TemporaryFixServiceImpl extends ServiceImpl temporaryFixImportFile(List temporaryFixList) { + String user = CommonMethods.getUser(); + String site = CommonMethods.getSite(); + LocalDateTime now = LocalDateTime.now(); + try { + for (TemporaryFix temporaryFix : temporaryFixList) { + String handle = StringUtil.createQUID(); + temporaryFix.setHandle(handle); + temporaryFix.setSite(site); + temporaryFix.setCreatedTime(now); + temporaryFix.setCreatedBy(user); + temporaryFix.setUpdatedBy(user); + temporaryFix.setUpdatedTime(now); + temporaryFix.setTotalWorkHours(String.valueOf(Float.valueOf(temporaryFix.getAmount()) * Float.valueOf(temporaryFix.getSingleWorkHours()))); + } + return temporaryFixList; + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/DateReportUtils.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/DateReportUtils.java index a8d8b262..e9726c4b 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/DateReportUtils.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/DateReportUtils.java @@ -147,6 +147,9 @@ public class DateReportUtils { * @throws ParseException */ public static Date stringToDate(String str, String date) { + if (str.indexOf("null") != -1){ + return null; + } try { SimpleDateFormat sdf = new SimpleDateFormat(date); return sdf.parse(str); diff --git a/anomaly/src/main/resources/mapper/TemporaryFixMapper.xml b/anomaly/src/main/resources/mapper/TemporaryFixMapper.xml index cf840ae2..0e321e67 100644 --- a/anomaly/src/main/resources/mapper/TemporaryFixMapper.xml +++ b/anomaly/src/main/resources/mapper/TemporaryFixMapper.xml @@ -28,11 +28,17 @@ + + + + + + - HANDLE, SITE, ENTRUST_DATE, ENTRUST_UNIT, DUTY_PERSON, DUTY_REASON, PROJECT_NUMBER, QUALITY_REVIEW_NUMBER, WORK_CONTACT_NUMBER, MATERIAL_CODE, MATERIAL_NAME, MAP_NO, AMOUNT, SINGLE_WORK_HOURS, TOTAL_WORK_HOURS, MACHINE_HOURS, OPERATOR, USE_DEVICE, DEVICE_TYPE, COST_CENTER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME + HANDLE, SITE, ENTRUST_DATE, ENTRUST_UNIT, DUTY_PERSON, DUTY_REASON, PROJECT_NUMBER, QUALITY_REVIEW_NUMBER, WORK_CONTACT_NUMBER, MATERIAL_CODE, MATERIAL_NAME, MAP_NO, AMOUNT, SINGLE_WORK_HOURS, TOTAL_WORK_HOURS, MACHINE_HOURS, OPERATOR, USE_DEVICE, DEVICE_TYPE, COST_CENTER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, UPLOAD_CENTER, UPLOAD_USER, CLASSIFY, DUTY_CLASSIFY, EMPLOY_PROPERTY, CENTER_CODE,ROWNUM SEQ @@ -65,7 +71,7 @@ SELECT FROM Z_TEMPORARY_FIX - HANDLE=#{ew.handle} + HANDLE=#{ew.handle} AND SITE=#{ew.entity.site} AND ENTRUST_DATE=#{ew.entity.entrustDate} @@ -90,6 +96,12 @@ AND CREATED_TIME=#{ew.entity.createdTime} AND UPDATED_BY=#{ew.entity.updatedBy} AND UPDATED_TIME=#{ew.entity.updatedTime} + AND UPLOAD_CENTER=#{ew.entity.uploadCenter} + AND UPLOAD_USER=#{ew.entity.uploadUser} + AND CLASSIFY=#{ew.entity.classify} + AND DUTY_CLASSIFY=#{ew.entity.dutyClassify} + AND EMPLOY_PROPERTY=#{ew.entity.employProperty} + AND CENTER_CODE=#{ew.entity.centerCode} @@ -98,32 +110,38 @@ - - HANDLE=#{ew.entity.handle} - - AND SITE=#{ew.entity.site} - AND ENTRUST_DATE=#{ew.entity.entrustDate} - AND ENTRUST_UNIT=#{ew.entity.entrustUnit} - AND DUTY_PERSON=#{ew.entity.dutyPerson} - AND DUTY_REASON=#{ew.entity.dutyReason} - AND PROJECT_NUMBER=#{ew.entity.projectNumber} - AND QUALITY_REVIEW_NUMBER=#{ew.entity.qualityReviewNumber} - AND WORK_CONTACT_NUMBER=#{ew.entity.workContactNumber} - AND MATERIAL_CODE=#{ew.entity.materialCode} - AND MATERIAL_NAME=#{ew.entity.materialName} - AND MAP_NO=#{ew.entity.mapNo} - AND AMOUNT=#{ew.entity.amount} - AND SINGLE_WORK_HOURS=#{ew.entity.singleWorkHours} - AND TOTAL_WORK_HOURS=#{ew.entity.totalWorkHours} - AND MACHINE_HOURS=#{ew.entity.machineHours} - AND OPERATOR=#{ew.entity.operator} - AND USE_DEVICE=#{ew.entity.useDevice} - AND DEVICE_TYPE=#{ew.entity.deviceType} - AND COST_CENTER=#{ew.entity.costCenter} - AND CREATED_BY=#{ew.entity.createdBy} - AND CREATED_TIME=#{ew.entity.createdTime} - AND UPDATED_BY=#{ew.entity.updatedBy} - AND UPDATED_TIME=#{ew.entity.updatedTime} + + HANDLE=#{ew.entity.handle} + + AND SITE=#{ew.entity.site} + AND ENTRUST_DATE=#{ew.entity.entrustDate} + AND ENTRUST_UNIT=#{ew.entity.entrustUnit} + AND DUTY_PERSON=#{ew.entity.dutyPerson} + AND DUTY_REASON=#{ew.entity.dutyReason} + AND PROJECT_NUMBER=#{ew.entity.projectNumber} + AND QUALITY_REVIEW_NUMBER=#{ew.entity.qualityReviewNumber} + AND WORK_CONTACT_NUMBER=#{ew.entity.workContactNumber} + AND MATERIAL_CODE=#{ew.entity.materialCode} + AND MATERIAL_NAME=#{ew.entity.materialName} + AND MAP_NO=#{ew.entity.mapNo} + AND AMOUNT=#{ew.entity.amount} + AND SINGLE_WORK_HOURS=#{ew.entity.singleWorkHours} + AND TOTAL_WORK_HOURS=#{ew.entity.totalWorkHours} + AND MACHINE_HOURS=#{ew.entity.machineHours} + AND OPERATOR=#{ew.entity.operator} + AND USE_DEVICE=#{ew.entity.useDevice} + AND DEVICE_TYPE=#{ew.entity.deviceType} + AND COST_CENTER=#{ew.entity.costCenter} + AND CREATED_BY=#{ew.entity.createdBy} + AND CREATED_TIME=#{ew.entity.createdTime} + AND UPDATED_BY=#{ew.entity.updatedBy} + AND UPDATED_TIME=#{ew.entity.updatedTime} + AND UPLOAD_CENTER=#{ew.entity.uploadCenter} + AND UPLOAD_USER=#{ew.entity.uploadUser} + AND CLASSIFY=#{ew.entity.classify} + AND DUTY_CLASSIFY=#{ew.entity.dutyClassify} + AND EMPLOY_PROPERTY=#{ew.entity.employProperty} + AND CENTER_CODE=#{ew.entity.centerCode} ${ew.sqlSegment} @@ -166,6 +184,12 @@ AND CREATED_TIME=#{ew.entity.createdTime} AND UPDATED_BY=#{ew.entity.updatedBy} AND UPDATED_TIME=#{ew.entity.updatedTime} + AND UPLOAD_CENTER=#{ew.entity.uploadCenter} + AND UPLOAD_USER=#{ew.entity.uploadUser} + AND CLASSIFY=#{ew.entity.classify} + AND DUTY_CLASSIFY=#{ew.entity.dutyClassify} + AND EMPLOY_PROPERTY=#{ew.entity.employProperty} + AND CENTER_CODE=#{ew.entity.centerCode} ${ew.sqlSegment} @@ -208,6 +232,12 @@ AND CREATED_TIME=#{ew.entity.createdTime} AND UPDATED_BY=#{ew.entity.updatedBy} AND UPDATED_TIME=#{ew.entity.updatedTime} + AND UPLOAD_CENTER=#{ew.entity.uploadCenter} + AND UPLOAD_USER=#{ew.entity.uploadUser} + AND CLASSIFY=#{ew.entity.classify} + AND DUTY_CLASSIFY=#{ew.entity.dutyClassify} + AND EMPLOY_PROPERTY=#{ew.entity.employProperty} + AND CENTER_CODE=#{ew.entity.centerCode} ${ew.sqlSegment} @@ -250,6 +280,12 @@ AND CREATED_TIME=#{ew.entity.createdTime} AND UPDATED_BY=#{ew.entity.updatedBy} AND UPDATED_TIME=#{ew.entity.updatedTime} + AND UPLOAD_CENTER=#{ew.entity.uploadCenter} + AND UPLOAD_USER=#{ew.entity.uploadUser} + AND CLASSIFY=#{ew.entity.classify} + AND DUTY_CLASSIFY=#{ew.entity.dutyClassify} + AND EMPLOY_PROPERTY=#{ew.entity.employProperty} + AND CENTER_CODE=#{ew.entity.centerCode} ${ew.sqlSegment} @@ -292,6 +328,12 @@ AND CREATED_TIME=#{ew.entity.createdTime} AND UPDATED_BY=#{ew.entity.updatedBy} AND UPDATED_TIME=#{ew.entity.updatedTime} + AND UPLOAD_CENTER=#{ew.entity.uploadCenter} + AND UPLOAD_USER=#{ew.entity.uploadUser} + AND CLASSIFY=#{ew.entity.classify} + AND DUTY_CLASSIFY=#{ew.entity.dutyClassify} + AND EMPLOY_PROPERTY=#{ew.entity.employProperty} + AND CENTER_CODE=#{ew.entity.centerCode} ${ew.sqlSegment} @@ -334,6 +376,12 @@ AND CREATED_TIME=#{ew.entity.createdTime} AND UPDATED_BY=#{ew.entity.updatedBy} AND UPDATED_TIME=#{ew.entity.updatedTime} + AND UPLOAD_CENTER=#{ew.entity.uploadCenter} + AND UPLOAD_USER=#{ew.entity.uploadUser} + AND CLASSIFY=#{ew.entity.classify} + AND DUTY_CLASSIFY=#{ew.entity.dutyClassify} + AND EMPLOY_PROPERTY=#{ew.entity.employProperty} + AND CENTER_CODE=#{ew.entity.centerCode} ${ew.sqlSegment} @@ -372,6 +420,12 @@ CREATED_TIME, UPDATED_BY, UPDATED_TIME, + UPLOAD_CENTER, + UPLOAD_USER, + CLASSIFY, + DUTY_CLASSIFY, + EMPLOY_PROPERTY, + CENTER_CODE, VALUES #{handle}, @@ -398,6 +452,12 @@ #{createdTime}, #{updatedBy}, #{updatedTime}, + #{uploadCenter}, + #{uploadUser}, + #{classify}, + #{dutyClassify}, + #{employProperty}, + #{centerCode}, @@ -431,6 +491,12 @@ #{createdTime}, #{updatedBy}, #{updatedTime}, + #{uploadCenter}, + #{uploadUser}, + #{classify}, + #{dutyClassify}, + #{employProperty}, + #{centerCode}, @@ -460,7 +526,13 @@ CREATED_TIME=#{et.createdTime}, UPDATED_BY=#{et.updatedBy}, UPDATED_TIME=#{et.updatedTime}, - WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + UPLOAD_CENTER=#{et.uploadCenter}, + UPLOAD_USER=#{et.uploadUser}, + CLASSIFY=#{et.classify}, + DUTY_CLASSIFY=#{et.dutyClassify}, + EMPLOY_PROPERTY=#{et.employProperty}, + CENTER_CODE=#{et.centerCode}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} @@ -489,7 +561,13 @@ CREATED_TIME=#{et.createdTime}, UPDATED_BY=#{et.updatedBy}, UPDATED_TIME=#{et.updatedTime}, - WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + UPLOAD_CENTER=#{et.uploadCenter}, + UPLOAD_USER=#{et.uploadUser}, + CLASSIFY=#{et.classify}, + DUTY_CLASSIFY=#{et.dutyClassify}, + EMPLOY_PROPERTY=#{et.employProperty}, + CENTER_CODE=#{et.centerCode}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} @@ -518,6 +596,12 @@ CREATED_TIME=#{et.createdTime}, UPDATED_BY=#{et.updatedBy}, UPDATED_TIME=#{et.updatedTime}, + UPLOAD_CENTER=#{et.uploadCenter}, + UPLOAD_USER=#{et.uploadUser}, + CLASSIFY=#{et.classify}, + DUTY_CLASSIFY=#{et.dutyClassify}, + EMPLOY_PROPERTY=#{et.employProperty}, + CENTER_CODE=#{et.centerCode}, @@ -546,6 +630,12 @@ AND CREATED_TIME=#{ew.entity.createdTime} AND UPDATED_BY=#{ew.entity.updatedBy} AND UPDATED_TIME=#{ew.entity.updatedTime} + AND UPLOAD_CENTER=#{ew.entity.uploadCenter} + AND UPLOAD_USER=#{ew.entity.uploadUser} + AND CLASSIFY=#{ew.entity.classify} + AND DUTY_CLASSIFY=#{ew.entity.dutyClassify} + AND EMPLOY_PROPERTY=#{ew.entity.employProperty} + AND CENTER_CODE=#{ew.entity.centerCode} ${ew.sqlSegment} @@ -605,6 +695,12 @@ AND CREATED_TIME=#{ew.entity.createdTime} AND UPDATED_BY=#{ew.entity.updatedBy} AND UPDATED_TIME=#{ew.entity.updatedTime} + AND UPLOAD_CENTER=#{ew.entity.uploadCenter} + AND UPLOAD_USER=#{ew.entity.uploadUser} + AND CLASSIFY=#{ew.entity.classify} + AND DUTY_CLASSIFY=#{ew.entity.dutyClassify} + AND EMPLOY_PROPERTY=#{ew.entity.employProperty} + AND CENTER_CODE=#{ew.entity.centerCode} ${ew.sqlSegment}