Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

临时修复报表

Browse Source
master
yinq 3 years ago
parent a896c61f26
commit 1e7d9eda5f
6 changed files with 295 additions and 61 deletions
Show Stats Download Patch File Download Diff File

90
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java
Unescape Escape View File

@ -1,5 +1,8 @@
package com.foreverwin.mesnac.anomaly.controller; 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.mesnac.common.util.StringUtil;
import com.foreverwin.modular.core.util.R; import com.foreverwin.modular.core.util.R;
import com.foreverwin.modular.core.util.FrontPage; 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.service.TemporaryFixService;
import com.foreverwin.mesnac.anomaly.model.TemporaryFix; import com.foreverwin.mesnac.anomaly.model.TemporaryFix;
import org.springframework.web.multipart.MultipartFile;
import javax.websocket.server.PathParam;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.logging.Handler;
/** /**
* *
@ -62,37 +68,26 @@ public class TemporaryFixController {
* @return * @return
*/ */
@GetMapping("/page") @GetMapping("/page")
public R page(FrontPage<TemporaryFix> frontPage, TemporaryFix temporaryFix){ public R page(FrontPage<TemporaryFix> frontPage, TemporaryFix temporaryFix,String startDate,String endDate,String createdTimeNew){
IPage result; IPage result;
QueryWrapper<TemporaryFix> queryWrapper = new QueryWrapper<>(); QueryWrapper<TemporaryFix> queryWrapper = new QueryWrapper<>();
//queryWrapper.setEntity(temporaryFix);
/*if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { queryWrapper.eq(!StringUtil.isBlank(temporaryFix.getEntrustUnit()),"ENTRUST_UNIT",temporaryFix.getEntrustUnit())
//TODO modify global query .like(!StringUtil.isBlank(temporaryFix.getDutyPerson()),"DUTY_PERSON",temporaryFix.getDutyPerson())
queryWrapper.lambda().and(wrapper -> wrapper .like(!StringUtil.isBlank(temporaryFix.getProjectNumber()),"PROJECT_NUMBER",temporaryFix.getProjectNumber())
.like(TemporaryFix::getHandle, frontPage.getGlobalQuery()) .like(!StringUtil.isBlank(temporaryFix.getQualityReviewNumber()),"QUALITY_REVIEW_NUMBER",temporaryFix.getQualityReviewNumber())
.or().like(TemporaryFix::getSite, frontPage.getGlobalQuery()) .like(!StringUtil.isBlank(temporaryFix.getWorkContactNumber()),"WORK_CONTACT_NUMBER",temporaryFix.getWorkContactNumber())
.or().like(TemporaryFix::getEntrustUnit, frontPage.getGlobalQuery()) .like(!StringUtil.isBlank(temporaryFix.getMaterialCode()),"MATERIAL_CODE",temporaryFix.getMaterialCode())
.or().like(TemporaryFix::getDutyPerson, frontPage.getGlobalQuery()) .like(!StringUtil.isBlank(temporaryFix.getMaterialName()),"MATERIAL_NAME",temporaryFix.getMaterialName())
.or().like(TemporaryFix::getDutyReason, frontPage.getGlobalQuery()) .like(!StringUtil.isBlank(temporaryFix.getMapNo()),"MAP_NO",temporaryFix.getMapNo())
.or().like(TemporaryFix::getProjectNumber, frontPage.getGlobalQuery()) .like(!StringUtil.isBlank(temporaryFix.getOperator()),"OPERATOR",temporaryFix.getOperator())
.or().like(TemporaryFix::getQualityReviewNumber, frontPage.getGlobalQuery()) .like(!StringUtil.isBlank(temporaryFix.getUseDevice()),"USE_DEVICE",temporaryFix.getUseDevice())
.or().like(TemporaryFix::getWorkContactNumber, frontPage.getGlobalQuery()) .eq(!StringUtil.isBlank(temporaryFix.getUploadCenter()),"UPLOAD_CENTER",temporaryFix.getUploadCenter())
.or().like(TemporaryFix::getMaterialCode, frontPage.getGlobalQuery()) .ge(!StringUtil.isBlank(startDate),"ENTRUST_DATE", DateReportUtils.stringToDate(startDate + " 00:00:00","yyyy-MM-dd HH:mm:ss"))
.or().like(TemporaryFix::getMaterialName, frontPage.getGlobalQuery()) .le(!StringUtil.isBlank(endDate),"ENTRUST_DATE",DateReportUtils.stringToDate(endDate + " 23:59:59","yyyy-MM-dd HH:mm:ss"))
.or().like(TemporaryFix::getMapNo, frontPage.getGlobalQuery()) .ge(!StringUtil.isBlank(createdTimeNew),"ENTRUST_DATE",DateReportUtils.stringToDate(createdTimeNew + " 00:00:00","yyyy-MM-dd HH:mm:ss"))
.or().like(TemporaryFix::getAmount, frontPage.getGlobalQuery()) .le(!StringUtil.isBlank(createdTimeNew),"ENTRUST_DATE",DateReportUtils.stringToDate(createdTimeNew + " 23:59:59","yyyy-MM-dd HH:mm:ss"))
.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());
result = temporaryFixService.page(frontPage.getPagePlus(), queryWrapper); result = temporaryFixService.page(frontPage.getPagePlus(), queryWrapper);
return R.ok(result); return R.ok(result);
@ -116,6 +111,7 @@ public class TemporaryFixController {
temporaryFix.setUpdatedBy(user); temporaryFix.setUpdatedBy(user);
temporaryFix.setUpdatedTime(now); temporaryFix.setUpdatedTime(now);
temporaryFix.setTotalWorkHours(String.valueOf(Float.valueOf(temporaryFix.getAmount()) * Float.valueOf(temporaryFix.getSingleWorkHours()))); temporaryFix.setTotalWorkHours(String.valueOf(Float.valueOf(temporaryFix.getAmount()) * Float.valueOf(temporaryFix.getSingleWorkHours())));
boolean result = temporaryFixService.save(temporaryFix); boolean result = temporaryFixService.save(temporaryFix);
return R.ok(result); return R.ok(result);
} }
@ -134,6 +130,42 @@ public class TemporaryFixController {
return R.ok(result); 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<TemporaryFix> util = new ExcelUtil<TemporaryFix>(TemporaryFix.class);
List<TemporaryFix> 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删除对象 * 根据id删除对象
* @param id 实体ID * @param id 实体ID

73
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/TemporaryFix.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.foreverwin.mesnac.anomaly.model;
import java.io.Serializable; import java.io.Serializable;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
@ -9,7 +10,10 @@ import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable; import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.foreverwin.mesnac.common.model.ExcelColumn;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
/** /**
* <p> * <p>
@ -24,126 +28,191 @@ import lombok.Data;
@Data @Data
public class TemporaryFix extends Model<TemporaryFix> { public class TemporaryFix extends Model<TemporaryFix> {
private static final long serialVersionUID = 1L;
/** /**
* 主键 * 主键
*/ */
@TableId(value = "HANDLE", type = IdType.INPUT) @TableId(value = "HANDLE", type = IdType.INPUT)
@ExcelColumn(value = "handle")
private String handle; private String handle;
/** /**
* 场地 * 场地
*/ */
@TableField("SITE") @TableField("SITE")
@ExcelColumn(value = "site")
private String site; private String site;
/** /**
* 委托日期 * 委托日期
*/ */
@TableField("ENTRUST_DATE") @TableField("ENTRUST_DATE")
@ExcelColumn(value = "委托日期")
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime entrustDate; private LocalDateTime entrustDate;
/** /**
* 委托/联系单位 * 委托/联系单位
*/ */
@TableField("ENTRUST_UNIT") @TableField("ENTRUST_UNIT")
@ExcelColumn(value = "委托/联系单位")
private String entrustUnit; private String entrustUnit;
/** /**
* 责任主体/人 * 责任主体/人
*/ */
@TableField("DUTY_PERSON") @TableField("DUTY_PERSON")
@ExcelColumn(value = "责任主体/人")
private String dutyPerson; private String dutyPerson;
/** /**
* 责任原因 * 责任原因
*/ */
@TableField("DUTY_REASON") @TableField("DUTY_REASON")
@ExcelColumn(value = "责任原因")
private String dutyReason; private String dutyReason;
/** /**
* 项目号 * 项目号
*/ */
@TableField("PROJECT_NUMBER") @TableField("PROJECT_NUMBER")
@ExcelColumn(value = "项目号")
private String projectNumber; private String projectNumber;
/** /**
* 质量评审单号 * 质量评审单号
*/ */
@TableField("QUALITY_REVIEW_NUMBER") @TableField("QUALITY_REVIEW_NUMBER")
@ExcelColumn(value = "质量评审单号")
private String qualityReviewNumber; private String qualityReviewNumber;
/** /**
* 工作联络单号 * 工作联络单号
*/ */
@TableField("WORK_CONTACT_NUMBER") @TableField("WORK_CONTACT_NUMBER")
@ExcelColumn(value = "工作联络单号")
private String workContactNumber; private String workContactNumber;
/** /**
* 物料编码 * 物料编码
*/ */
@TableField("MATERIAL_CODE") @TableField("MATERIAL_CODE")
@ExcelColumn(value = "物料编码")
private String materialCode; private String materialCode;
/** /**
* 物料名称 * 物料名称
*/ */
@TableField("MATERIAL_NAME") @TableField("MATERIAL_NAME")
@ExcelColumn(value = "物料名称")
private String materialName; private String materialName;
/** /**
* 图号 * 图号
*/ */
@TableField("MAP_NO") @TableField("MAP_NO")
@ExcelColumn(value = "图号")
private String mapNo; private String mapNo;
/** /**
* 数量 * 数量
*/ */
@TableField("AMOUNT") @TableField("AMOUNT")
@ExcelColumn(value = "数量")
private String amount; private String amount;
/** /**
* 单件工时 * 单件工时
*/ */
@TableField("SINGLE_WORK_HOURS") @TableField("SINGLE_WORK_HOURS")
@ExcelColumn(value = "单件工时")
private String singleWorkHours; private String singleWorkHours;
/** /**
* 总工时 * 总工时
*/ */
@TableField("TOTAL_WORK_HOURS") @TableField("TOTAL_WORK_HOURS")
@ExcelColumn(value = "总工时")
private String totalWorkHours; private String totalWorkHours;
/** /**
* 机时 * 机时
*/ */
@TableField("MACHINE_HOURS") @TableField("MACHINE_HOURS")
@ExcelColumn(value = "机时")
private String machineHours; private String machineHours;
/** /**
* 操作者 * 操作者
*/ */
@TableField("OPERATOR") @TableField("OPERATOR")
@ExcelColumn(value = "操作者")
private String operator; private String operator;
/** /**
* 使用设备 * 使用设备
*/ */
@TableField("USE_DEVICE") @TableField("USE_DEVICE")
@ExcelColumn(value = "使用设备")
private String useDevice; private String useDevice;
/** /**
* 设备型号 * 设备型号
*/ */
@TableField("DEVICE_TYPE") @TableField("DEVICE_TYPE")
@ExcelColumn(value = "设备型号")
private String deviceType; private String deviceType;
/** /**
* 成本中心 * 成本中心
*/ */
@TableField("COST_CENTER") @TableField("COST_CENTER")
@ExcelColumn(value = "成本中心")
private String costCenter; 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") @TableField("CREATED_BY")
@ExcelColumn(value = "createdBy")
private String createdBy; private String createdBy;
/** /**
* 创建时间 * 创建时间
*/ */
@TableField("CREATED_TIME") @TableField("CREATED_TIME")
@ExcelColumn(value = "createdTime")
private LocalDateTime createdTime; private LocalDateTime createdTime;
/** /**
* 更新人 * 更新人
*/ */
@TableField("UPDATED_BY") @TableField("UPDATED_BY")
@ExcelColumn(value = "updatedBy")
private String updatedBy; private String updatedBy;
/** /**
* 更新时间 * 更新时间
*/ */
@TableField("UPDATED_TIME") @TableField("UPDATED_TIME")
@ExcelColumn(value = "updatedTime")
private LocalDateTime updatedTime; private LocalDateTime updatedTime;
@TableField(exist = false)
@ExcelColumn(value = "SEQ")
private Integer SEQ;
} }

2
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/TemporaryFixService.java
Unescape Escape View File

@ -25,4 +25,6 @@ public interface TemporaryFixService extends IService<TemporaryFix> {
IPage<TemporaryFix> selectPage(FrontPage<TemporaryFix> frontPage, TemporaryFix temporaryFix); IPage<TemporaryFix> selectPage(FrontPage<TemporaryFix> frontPage, TemporaryFix temporaryFix);
List<TemporaryFix> selectList(TemporaryFix temporaryFix); List<TemporaryFix> selectList(TemporaryFix temporaryFix);
List<TemporaryFix> temporaryFixImportFile(List<TemporaryFix> temporaryFixList);
} }

32
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/TemporaryFixServiceImpl.java
Unescape Escape View File

@ -1,5 +1,7 @@
package com.foreverwin.mesnac.anomaly.service.impl; 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.foreverwin.modular.core.util.FrontPage;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; 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.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
/** /**
* <p> * <p>
* 临时修复表 服务实现类 * 临时修复表 服务实现类
@ -42,5 +46,33 @@ public class TemporaryFixServiceImpl extends ServiceImpl<TemporaryFixMapper, Tem
return super.list(queryWrapper); return super.list(queryWrapper);
} }
/**
* 文件导入
*
* @param temporaryFixList
* @return
*/
@Override
public List<TemporaryFix> temporaryFixImportFile(List<TemporaryFix> 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;
}
} }

3
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/DateReportUtils.java
Unescape Escape View File

@ -147,6 +147,9 @@ public class DateReportUtils {
* @throws ParseException * @throws ParseException
*/ */
public static Date stringToDate(String str, String date) { public static Date stringToDate(String str, String date) {
if (str.indexOf("null") != -1){
return null;
}
try { try {
SimpleDateFormat sdf = new SimpleDateFormat(date); SimpleDateFormat sdf = new SimpleDateFormat(date);
return sdf.parse(str); return sdf.parse(str);

98
anomaly/src/main/resources/mapper/TemporaryFixMapper.xml
Unescape Escape View File

@ -28,11 +28,17 @@
<result column="CREATED_TIME" property="createdTime" /> <result column="CREATED_TIME" property="createdTime" />
<result column="UPDATED_BY" property="updatedBy" /> <result column="UPDATED_BY" property="updatedBy" />
<result column="UPDATED_TIME" property="updatedTime" /> <result column="UPDATED_TIME" property="updatedTime" />
<result column="UPLOAD_CENTER" property="uploadCenter" />
<result column="UPLOAD_USER" property="uploadUser" />
<result column="CLASSIFY" property="classify" />
<result column="DUTY_CLASSIFY" property="dutyClassify" />
<result column="EMPLOY_PROPERTY" property="employProperty" />
<result column="CENTER_CODE" property="centerCode" />
</resultMap> </resultMap>
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
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
</sql> </sql>
<!-- BaseMapper标准查询/修改/删除 --> <!-- BaseMapper标准查询/修改/删除 -->
@ -90,6 +96,12 @@
<if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if> <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
<if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if> <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
<if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if> <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
<if test="ew.entity.uploadCenter!=null"> AND UPLOAD_CENTER=#{ew.entity.uploadCenter}</if>
<if test="ew.entity.uploadUser!=null"> AND UPLOAD_USER=#{ew.entity.uploadUser}</if>
<if test="ew.entity.classify!=null"> AND CLASSIFY=#{ew.entity.classify}</if>
<if test="ew.entity.dutyClassify!=null"> AND DUTY_CLASSIFY=#{ew.entity.dutyClassify}</if>
<if test="ew.entity.employProperty!=null"> AND EMPLOY_PROPERTY=#{ew.entity.employProperty}</if>
<if test="ew.entity.centerCode!=null"> AND CENTER_CODE=#{ew.entity.centerCode}</if>
</where> </where>
</select> </select>
@ -124,6 +136,12 @@
<if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if> <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
<if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if> <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
<if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if> <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
<if test="ew.entity.uploadCenter!=null"> AND UPLOAD_CENTER=#{ew.entity.uploadCenter}</if>
<if test="ew.entity.uploadUser!=null"> AND UPLOAD_USER=#{ew.entity.uploadUser}</if>
<if test="ew.entity.classify!=null"> AND CLASSIFY=#{ew.entity.classify}</if>
<if test="ew.entity.dutyClassify!=null"> AND DUTY_CLASSIFY=#{ew.entity.dutyClassify}</if>
<if test="ew.entity.employProperty!=null"> AND EMPLOY_PROPERTY=#{ew.entity.employProperty}</if>
<if test="ew.entity.centerCode!=null"> AND CENTER_CODE=#{ew.entity.centerCode}</if>
</if> </if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere"> <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment} ${ew.sqlSegment}
@ -166,6 +184,12 @@
<if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if> <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
<if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if> <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
<if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if> <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
<if test="ew.entity.uploadCenter!=null"> AND UPLOAD_CENTER=#{ew.entity.uploadCenter}</if>
<if test="ew.entity.uploadUser!=null"> AND UPLOAD_USER=#{ew.entity.uploadUser}</if>
<if test="ew.entity.classify!=null"> AND CLASSIFY=#{ew.entity.classify}</if>
<if test="ew.entity.dutyClassify!=null"> AND DUTY_CLASSIFY=#{ew.entity.dutyClassify}</if>
<if test="ew.entity.employProperty!=null"> AND EMPLOY_PROPERTY=#{ew.entity.employProperty}</if>
<if test="ew.entity.centerCode!=null"> AND CENTER_CODE=#{ew.entity.centerCode}</if>
</if> </if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere"> <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment} ${ew.sqlSegment}
@ -208,6 +232,12 @@
<if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if> <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
<if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if> <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
<if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if> <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
<if test="ew.entity.uploadCenter!=null"> AND UPLOAD_CENTER=#{ew.entity.uploadCenter}</if>
<if test="ew.entity.uploadUser!=null"> AND UPLOAD_USER=#{ew.entity.uploadUser}</if>
<if test="ew.entity.classify!=null"> AND CLASSIFY=#{ew.entity.classify}</if>
<if test="ew.entity.dutyClassify!=null"> AND DUTY_CLASSIFY=#{ew.entity.dutyClassify}</if>
<if test="ew.entity.employProperty!=null"> AND EMPLOY_PROPERTY=#{ew.entity.employProperty}</if>
<if test="ew.entity.centerCode!=null"> AND CENTER_CODE=#{ew.entity.centerCode}</if>
</if> </if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere"> <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment} ${ew.sqlSegment}
@ -250,6 +280,12 @@
<if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if> <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
<if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if> <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
<if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if> <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
<if test="ew.entity.uploadCenter!=null"> AND UPLOAD_CENTER=#{ew.entity.uploadCenter}</if>
<if test="ew.entity.uploadUser!=null"> AND UPLOAD_USER=#{ew.entity.uploadUser}</if>
<if test="ew.entity.classify!=null"> AND CLASSIFY=#{ew.entity.classify}</if>
<if test="ew.entity.dutyClassify!=null"> AND DUTY_CLASSIFY=#{ew.entity.dutyClassify}</if>
<if test="ew.entity.employProperty!=null"> AND EMPLOY_PROPERTY=#{ew.entity.employProperty}</if>
<if test="ew.entity.centerCode!=null"> AND CENTER_CODE=#{ew.entity.centerCode}</if>
</if> </if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere"> <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment} ${ew.sqlSegment}
@ -292,6 +328,12 @@
<if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if> <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
<if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if> <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
<if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if> <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
<if test="ew.entity.uploadCenter!=null"> AND UPLOAD_CENTER=#{ew.entity.uploadCenter}</if>
<if test="ew.entity.uploadUser!=null"> AND UPLOAD_USER=#{ew.entity.uploadUser}</if>
<if test="ew.entity.classify!=null"> AND CLASSIFY=#{ew.entity.classify}</if>
<if test="ew.entity.dutyClassify!=null"> AND DUTY_CLASSIFY=#{ew.entity.dutyClassify}</if>
<if test="ew.entity.employProperty!=null"> AND EMPLOY_PROPERTY=#{ew.entity.employProperty}</if>
<if test="ew.entity.centerCode!=null"> AND CENTER_CODE=#{ew.entity.centerCode}</if>
</if> </if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere"> <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment} ${ew.sqlSegment}
@ -334,6 +376,12 @@
<if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if> <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
<if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if> <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
<if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if> <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
<if test="ew.entity.uploadCenter!=null"> AND UPLOAD_CENTER=#{ew.entity.uploadCenter}</if>
<if test="ew.entity.uploadUser!=null"> AND UPLOAD_USER=#{ew.entity.uploadUser}</if>
<if test="ew.entity.classify!=null"> AND CLASSIFY=#{ew.entity.classify}</if>
<if test="ew.entity.dutyClassify!=null"> AND DUTY_CLASSIFY=#{ew.entity.dutyClassify}</if>
<if test="ew.entity.employProperty!=null"> AND EMPLOY_PROPERTY=#{ew.entity.employProperty}</if>
<if test="ew.entity.centerCode!=null"> AND CENTER_CODE=#{ew.entity.centerCode}</if>
</if> </if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere"> <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment} ${ew.sqlSegment}
@ -372,6 +420,12 @@
<if test="createdTime!=null">CREATED_TIME,</if> <if test="createdTime!=null">CREATED_TIME,</if>
<if test="updatedBy!=null">UPDATED_BY,</if> <if test="updatedBy!=null">UPDATED_BY,</if>
<if test="updatedTime!=null">UPDATED_TIME,</if> <if test="updatedTime!=null">UPDATED_TIME,</if>
<if test="uploadCenter!=null">UPLOAD_CENTER,</if>
<if test="uploadUser!=null">UPLOAD_USER,</if>
<if test="classify!=null">CLASSIFY,</if>
<if test="dutyClassify!=null">DUTY_CLASSIFY,</if>
<if test="employProperty!=null">EMPLOY_PROPERTY,</if>
<if test="centerCode!=null">CENTER_CODE,</if>
</trim> VALUES </trim> VALUES
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
#{handle}, #{handle},
@ -398,6 +452,12 @@
<if test="createdTime!=null">#{createdTime},</if> <if test="createdTime!=null">#{createdTime},</if>
<if test="updatedBy!=null">#{updatedBy},</if> <if test="updatedBy!=null">#{updatedBy},</if>
<if test="updatedTime!=null">#{updatedTime},</if> <if test="updatedTime!=null">#{updatedTime},</if>
<if test="uploadCenter!=null">#{uploadCenter},</if>
<if test="uploadUser!=null">#{uploadUser},</if>
<if test="classify!=null">#{classify},</if>
<if test="dutyClassify!=null">#{dutyClassify},</if>
<if test="employProperty!=null">#{employProperty},</if>
<if test="centerCode!=null">#{centerCode},</if>
</trim> </trim>
</insert> </insert>
@ -431,6 +491,12 @@
#{createdTime}, #{createdTime},
#{updatedBy}, #{updatedBy},
#{updatedTime}, #{updatedTime},
#{uploadCenter},
#{uploadUser},
#{classify},
#{dutyClassify},
#{employProperty},
#{centerCode},
</trim> </trim>
</insert> </insert>
@ -460,6 +526,12 @@
<if test="et.createdTime!=null">CREATED_TIME=#{et.createdTime},</if> <if test="et.createdTime!=null">CREATED_TIME=#{et.createdTime},</if>
<if test="et.updatedBy!=null">UPDATED_BY=#{et.updatedBy},</if> <if test="et.updatedBy!=null">UPDATED_BY=#{et.updatedBy},</if>
<if test="et.updatedTime!=null">UPDATED_TIME=#{et.updatedTime},</if> <if test="et.updatedTime!=null">UPDATED_TIME=#{et.updatedTime},</if>
<if test="et.uploadCenter!=null">UPLOAD_CENTER=#{et.uploadCenter},</if>
<if test="et.uploadUser!=null">UPLOAD_USER=#{et.uploadUser},</if>
<if test="et.classify!=null">CLASSIFY=#{et.classify},</if>
<if test="et.dutyClassify!=null">DUTY_CLASSIFY=#{et.dutyClassify},</if>
<if test="et.employProperty!=null">EMPLOY_PROPERTY=#{et.employProperty},</if>
<if test="et.centerCode!=null">CENTER_CODE=#{et.centerCode},</if>
</trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if> </trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
</update> </update>
@ -489,6 +561,12 @@
CREATED_TIME=#{et.createdTime}, CREATED_TIME=#{et.createdTime},
UPDATED_BY=#{et.updatedBy}, UPDATED_BY=#{et.updatedBy},
UPDATED_TIME=#{et.updatedTime}, 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},
</trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if> </trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
</update> </update>
@ -518,6 +596,12 @@
<if test="et.createdTime!=null">CREATED_TIME=#{et.createdTime},</if> <if test="et.createdTime!=null">CREATED_TIME=#{et.createdTime},</if>
<if test="et.updatedBy!=null">UPDATED_BY=#{et.updatedBy},</if> <if test="et.updatedBy!=null">UPDATED_BY=#{et.updatedBy},</if>
<if test="et.updatedTime!=null">UPDATED_TIME=#{et.updatedTime},</if> <if test="et.updatedTime!=null">UPDATED_TIME=#{et.updatedTime},</if>
<if test="et.uploadCenter!=null">UPLOAD_CENTER=#{et.uploadCenter},</if>
<if test="et.uploadUser!=null">UPLOAD_USER=#{et.uploadUser},</if>
<if test="et.classify!=null">CLASSIFY=#{et.classify},</if>
<if test="et.dutyClassify!=null">DUTY_CLASSIFY=#{et.dutyClassify},</if>
<if test="et.employProperty!=null">EMPLOY_PROPERTY=#{et.employProperty},</if>
<if test="et.centerCode!=null">CENTER_CODE=#{et.centerCode},</if>
</trim> </trim>
<where> <where>
<if test="ew!=null"> <if test="ew!=null">
@ -546,6 +630,12 @@
<if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if> <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
<if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if> <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
<if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if> <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
<if test="ew.entity.uploadCenter!=null"> AND UPLOAD_CENTER=#{ew.entity.uploadCenter}</if>
<if test="ew.entity.uploadUser!=null"> AND UPLOAD_USER=#{ew.entity.uploadUser}</if>
<if test="ew.entity.classify!=null"> AND CLASSIFY=#{ew.entity.classify}</if>
<if test="ew.entity.dutyClassify!=null"> AND DUTY_CLASSIFY=#{ew.entity.dutyClassify}</if>
<if test="ew.entity.employProperty!=null"> AND EMPLOY_PROPERTY=#{ew.entity.employProperty}</if>
<if test="ew.entity.centerCode!=null"> AND CENTER_CODE=#{ew.entity.centerCode}</if>
</if> </if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere"> <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment} ${ew.sqlSegment}
@ -605,6 +695,12 @@
<if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if> <if test="ew.entity.createdTime!=null"> AND CREATED_TIME=#{ew.entity.createdTime}</if>
<if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if> <if test="ew.entity.updatedBy!=null"> AND UPDATED_BY=#{ew.entity.updatedBy}</if>
<if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if> <if test="ew.entity.updatedTime!=null"> AND UPDATED_TIME=#{ew.entity.updatedTime}</if>
<if test="ew.entity.uploadCenter!=null"> AND UPLOAD_CENTER=#{ew.entity.uploadCenter}</if>
<if test="ew.entity.uploadUser!=null"> AND UPLOAD_USER=#{ew.entity.uploadUser}</if>
<if test="ew.entity.classify!=null"> AND CLASSIFY=#{ew.entity.classify}</if>
<if test="ew.entity.dutyClassify!=null"> AND DUTY_CLASSIFY=#{ew.entity.dutyClassify}</if>
<if test="ew.entity.employProperty!=null"> AND EMPLOY_PROPERTY=#{ew.entity.employProperty}</if>
<if test="ew.entity.centerCode!=null"> AND CENTER_CODE=#{ew.entity.centerCode}</if>
</if> </if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere"> <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment} ${ew.sqlSegment}

Write Preview
Loading…
Cancel
Save