diff --git a/bonus-modules/bonus-material-mall/pom.xml b/bonus-modules/bonus-material-mall/pom.xml index 15c15e8..72546d3 100644 --- a/bonus-modules/bonus-material-mall/pom.xml +++ b/bonus-modules/bonus-material-mall/pom.xml @@ -106,6 +106,14 @@ test + + + + org.apache.poi + poi-ooxml + 5.2.3 + + diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java index 540a0d3..a62781a 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java @@ -29,8 +29,9 @@ public class BmContractController extends BaseController { @ApiOperation(value = "合同列表") @GetMapping("/list") public AjaxResult list(BmContract bmContract) { + startPage(); List list = bmContractService.list(bmContract); - return AjaxResult.success(list); + return AjaxResult.success(getDataTable(list)); } @ApiOperation(value = "合同新增") @PostMapping("/add") @@ -63,4 +64,14 @@ public class BmContractController extends BaseController { } } + @ApiOperation(value = "合同状态修改（开启/关闭）") + @PostMapping("/updateStatus") + public AjaxResult updateStatus(@RequestBody BmContract bmContract) { + Integer i = bmContractService.updateStatus(bmContract); + if (i > 0){ + return AjaxResult.success(); + }else { + return AjaxResult.error(); + } + } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/domain/BmContract.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/domain/BmContract.java index b84d748..a498d84 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/domain/BmContract.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/domain/BmContract.java @@ -27,11 +27,11 @@ public class BmContract { private Integer status; @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; @ApiModelProperty(value = "修改时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; @ApiModelProperty(value = "用户id") @@ -40,6 +40,9 @@ public class BmContract { @ApiModelProperty(value = "用户所属公司") private Long ownerCom; + private String startTime; + private String endTime; + @ApiModelProperty(value = "文件附件") private List bmFileInfoList; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java index 7cab463..9cbd1f4 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java @@ -21,4 +21,8 @@ public interface BmContractMapper { Integer del(BmContract bmContract); String selectTaskNumByMonth(@Param("date") Date nowDate); + + Integer updateStatus(BmContract bmContract); + + Integer updateStatusOther(BmContract bmContract); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java index 2404d9e..195e470 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java @@ -18,4 +18,6 @@ public interface BmContractService { Integer edit(BmContract bmContract); Integer del(BmContract bmContract); + + Integer updateStatus(BmContract bmContract); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java index 418aaf8..b15a0fd 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java @@ -97,6 +97,24 @@ public class BmContractServiceImpl implements BmContractService { return del; } + @Override + public Integer updateStatus(BmContract bmContract) { + if (bmContract.getStatus() == 0) { + // 禁用 + return bmContractMapper.updateStatus(bmContract); + } else { + // 开启 + Integer i = bmContractMapper.updateStatus(bmContract); + if (i > 0) { + // 其他的禁用 + bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + return bmContractMapper.updateStatusOther(bmContract); + } else { + return i; + } + } + } + private String getString() { //根据前台传过来的数据，生成需求编号 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java index dacf63f..3a2b237 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java @@ -66,6 +66,9 @@ public class MaDevQc extends BaseEntity implements Serializable { @ApiModelProperty(value = "上传人") private String nickName; + @ApiModelProperty(value = "创建人所属公司") + private String qcCom; + @ApiModelProperty(value = "质检次数") private Integer minNum; private Integer maxNum; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevRm.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevRm.java index 9d4b620..fd08e4f 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevRm.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevRm.java @@ -63,6 +63,9 @@ public class MaDevRm extends BaseEntity implements Serializable { @ApiModelProperty(value = "上传人") private String nickName; + @ApiModelProperty(value = "上传人所属公司") + private String rmCom; + @ApiModelProperty(value = "维保次数") private Integer minNum; private Integer maxNum; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/SafeBookInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/SafeBookInfo.java index 9bdf66e..27f1297 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/SafeBookInfo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/SafeBookInfo.java @@ -52,4 +52,7 @@ public class SafeBookInfo { @ApiModelProperty(value = "上传人") private String nickName; + + @ApiModelProperty(value = "上传人所属公司") + private Integer uploadCom; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index b4e46da..63a193e 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -761,6 +761,7 @@ public class DevInfoServiceImpl implements DevInfoService { @Override public List getTagDevList(DevInfoVo devInfoVo) { + devInfoVo.setOwnCo(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); return devInfoMapper.getTagDevList(devInfoVo); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java index b62fcf0..e6f1d2c 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java @@ -44,6 +44,7 @@ public class MaDevQcServiceImpl implements MaDevQcService { */ @Override public List selectDevQcList(MaDevQc maDevQc) { + maDevQc.setQcCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString()); return maDevQcMapper.selectDevQcList(maDevQc); } @@ -62,6 +63,7 @@ public class MaDevQcServiceImpl implements MaDevQcService { maDevQc.setQcCode(code); maDevQc.setCreateBy(String.valueOf(SecurityUtils.getUserId())); maDevQc.setCreateTime(DateUtils.getNowDate()); + maDevQc.setQcCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString()); int result = maDevQcMapper.insertDevQc(maDevQc); devInfoMapper.updateDevInfoIsQc(maDevQc); if (result > 0 && maDevQc.getId() != null) { diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevRmServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevRmServiceImpl.java index 48ca4d6..b68b12b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevRmServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevRmServiceImpl.java @@ -36,11 +36,12 @@ public class MaDevRmServiceImpl implements MaDevRmService { /** * 装备质检列表 * - * @param maDevQc + * @param maDevRm * @return */ @Override public List selectDevQcList(MaDevRm maDevRm) { + maDevRm.setRmCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString()); return maDevRmMapper.selectDevQcList(maDevRm); } @@ -59,6 +60,7 @@ public class MaDevRmServiceImpl implements MaDevRmService { maDevRm.setRmCode(code); maDevRm.setCreateBy(String.valueOf(SecurityUtils.getUserId())); maDevRm.setCreateTime(DateUtils.getNowDate()); + maDevRm.setRmCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString()); int result = maDevRmMapper.insertDevQc(maDevRm); // devInfoMapper.updateDevInfoIsQc(maDevRm); if (result > 0 && maDevRm.getId() != null) { diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/SafeBookServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/SafeBookServiceImpl.java index 153cd0c..60d203f 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/SafeBookServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/SafeBookServiceImpl.java @@ -37,6 +37,7 @@ public class SafeBookServiceImpl implements SafeBookService { @Override public List getSafeBookByMaId(SafeBookInfo safeBookInfo) { + safeBookInfo.setUploadCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue()); return safeBookMapper.getSafeBookByMaId(safeBookInfo); } @@ -44,6 +45,7 @@ public class SafeBookServiceImpl implements SafeBookService { public Integer addSafeBook(SafeBookInfo safeBookInfo) { safeBookInfo.setCode(getString()); safeBookInfo.setUploadPerson(SecurityUtils.getLoginUser().getUserid()); + safeBookInfo.setUploadCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue()); Integer i = safeBookMapper.addSafeBook(safeBookInfo); devInfoMapper.updateDevInfoIsSafeBook(safeBookInfo); if (i > 0) { diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index f5de88a..87a3c85 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -8,6 +8,8 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.book.domain.BookCarInfoDto; +import com.bonus.material.contract.domain.BmContract; +import com.bonus.material.contract.service.BmContractService; import com.bonus.material.order.domain.OrderDetailCostReliefDto; import com.bonus.material.order.domain.OrderDetailDto; import com.bonus.material.order.domain.OrderInfoDto; @@ -16,10 +18,26 @@ import com.bonus.material.order.service.OrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.xwpf.usermodel.*; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; import java.util.List; +import java.util.Map; /** * @Author：liang.chao @@ -37,6 +55,9 @@ public class OrderController extends BaseController { @Resource private OrderMapper orderMapper; + @Resource + private BmContractService bmContractService; + /** * 提交预约车到订单 */ @@ -110,9 +131,9 @@ public class OrderController extends BaseController { if (dtos.size() > 0 && CollectionUtil.isNotEmpty(dtos)) { for (OrderDetailDto dto : dtos) { // if ("0".equals(dto.getManageType())) { - // 编码设备已取消的继续上架 - dto.setMaStatus(MaStatusEnum.LISTING.getCode().toString()); - orderMapper.updateDeviceStatus(dto); + // 编码设备已取消的继续上架 + dto.setMaStatus(MaStatusEnum.LISTING.getCode().toString()); + orderMapper.updateDeviceStatus(dto); /* } else { // 数量设备已退租的增加库存 orderMapper.updateAddDevCount(dto); @@ -141,4 +162,64 @@ public class OrderController extends BaseController { return error("发起减免失败"); } } + + @ApiOperation(value = "租赁协议(查看)") + @PostMapping("/leaseAgreement") + public ResponseEntity getleaseAgreement(@RequestParam String orderId, + @RequestParam("file") MultipartFile file, + @RequestParam Map replacements) throws IOException { + OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId); + /* BmContract bmContract = new BmContract(); + bmContract.setStatus(1); + List list = bmContractService.list(bmContract); + String wordUrl = list.get(0).getBmFileInfoList().get(0).getFileUrl(); + InputStream inputStream = new URL(wordUrl).openStream(); + + XWPFDocument document = new XWPFDocument(inputStream);*/ + XWPFDocument document = new XWPFDocument(file.getInputStream()); + //订单日期 + replacements.put("${orderTime}", orderInfoDto.getOrderTime().toString()); + //装备所属公司 + replacements.put("${czcompanyName}", orderInfoDto.getCzcompanyName()); + //承租方所属公司 + replacements.put("${companyName}", orderInfoDto.getCompanyName()); + //订单金额 + replacements.put("${cost}", orderInfoDto.getCost().toString()); + + for (IBodyElement element : document.getBodyElements()) { + if (element instanceof XWPFParagraph) { + XWPFParagraph paragraph = (XWPFParagraph) element; + for (XWPFRun run : paragraph.getRuns()) { + String text = run.getText(0); + if (text != null) { + for (Map.Entry entry : replacements.entrySet()) { + text = text.replace(entry.getKey(), entry.getValue()); + } + run.setText(text, 0); + } + } + } + } + + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + document.write(outputStream); + byte[] wordBytes = outputStream.toByteArray(); + + // Convert Word to Image (simple example using BufferedImage) + BufferedImage image = new BufferedImage(800, 600, BufferedImage.TYPE_INT_RGB); + Graphics2D graphics = image.createGraphics(); + graphics.setPaint(Color.white); + graphics.fillRect(0, 0, image.getWidth(), image.getHeight()); + graphics.setPaint(Color.black); + graphics.drawString(new String(wordBytes), 10, 20); + graphics.dispose(); + + ByteArrayOutputStream imageOutputStream = new ByteArrayOutputStream(); + ImageIO.write(image, "png", imageOutputStream); + byte[] imageBytes = imageOutputStream.toByteArray(); + + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.IMAGE_PNG); + return ResponseEntity.ok().headers(headers).body(imageBytes); + } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java index 3615ebf..e9dd9cd 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java @@ -43,4 +43,6 @@ public interface OrderMapper { int deleteCostReliefs(@Param("orderId") Integer orderId); int insertCostReliefs(@Param("list") List reliefList); + + OrderInfoDto getAgreementByOrderId(String orderId); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java index ba13eba..6778895 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java @@ -19,4 +19,6 @@ public interface OrderService { OrderInfoDto getOrderDetailsById(OrderDetailDto dto) throws Exception; Integer submitCostRelief(OrderInfoDto orderInfoDto); + + OrderInfoDto getAgreementByOrderId(String orderId); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 2fd6ca4..3c459ca 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -106,8 +106,6 @@ public class OrderServiceImpl implements OrderService { if (minOrderStatus.isPresent()) { dto.setOrderStatus(minOrderStatus.get().getOrderStatus()); } - dto.setStartTime(list.get(0).getRentBeginTime()); - dto.setEndTime(list.get(0).getRentEndTime()); //根据订单id去lease_repair_record表中查询是否已填写退租检修信息 int count = mapper.selectLeaseContent(String.valueOf(dto.getOrderId())); if (count > 0) { @@ -144,4 +142,9 @@ public class OrderServiceImpl implements OrderService { } return 0; } + + @Override + public OrderInfoDto getAgreementByOrderId(String orderId) { + return orderMapper.getAgreementByOrderId(orderId); + } } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml index e81efc4..536e12e 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml @@ -9,12 +9,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update bm_contract set - contract_name = #{contractName}, + contract_name = #{contractName}, + status = #{status}, owner_id = #{ownerId}, owner_com = #{ownerCom}, update_time = now() where id = #{id} + + update bm_contract set status = #{status} where id = #{id} + + + update bm_contract set status = 0 where owner_com = #{ownerCom} and id != #{id} + delete from bm_contract where id = #{id} @@ -29,6 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and contract_name like concat('%', #{contractName}, '%') + + AND update_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') + and status = #{status} diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 4696a66..945eff8 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -763,6 +763,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE d.is_active = 1 AND d.ma_status !=0 + AND d.own_co = #{ownCo} and d.code like concat('%',#{code},'%') @@ -776,7 +777,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and dept.dept_name like concat('%',#{comName},'%') - and DATE_FORMAT(d.create_time,'%Y-%m-%d') between #{startTime} and #{endTime} + and DATE_FORMAT(d.create_time,'%Y-%m-%d') between #{startTime} and #{endTime} diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml index 07ef741..ede06ec 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml @@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qc_name, qc_code, qc_user, + qc_com, qc_time, create_by, create_time, @@ -25,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{qcName}, #{qcCode}, #{qcUser}, + #{qcCom}, #{qcTime}, #{createBy}, #{createTime}, @@ -78,6 +80,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE_FORMAT(m1.create_time,'%Y-%m-%d') between #{createStartTime} and #{createEndTime} + + and m1.qc_com = #{qcCom} + + delete from ma_order_details_relief