bug修改，耗材字典控制是否必填，委托验收bug，新增配送产品其他一些bug问题
parent
9439249026
commit
9c6364e8c2
@ -0,0 +1,49 @@
|
||||
package com.glxp.sale.admin.controller.info;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.sale.admin.entity.info.BasicProductSetEntity;
|
||||
import com.glxp.sale.admin.entity.info.CompanyCertEntity;
|
||||
import com.glxp.sale.admin.entity.info.SetupEntity;
|
||||
import com.glxp.sale.admin.req.info.CompanyRequest;
|
||||
import com.glxp.sale.admin.req.info.FilterBasicProductSetrequest;
|
||||
import com.glxp.sale.admin.res.PageSimpleResponse;
|
||||
import com.glxp.sale.admin.service.info.BasicProductSetService;
|
||||
import com.glxp.sale.common.enums.ResultEnum;
|
||||
import com.glxp.sale.common.res.BaseResponse;
|
||||
import com.glxp.sale.common.util.ResultVOUtils;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
public class BasicProductSetController {
|
||||
|
||||
@Resource
|
||||
BasicProductSetService basicProductSetService;
|
||||
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/spms/basicProduct/setup/filter")
|
||||
public BaseResponse filterSetUps(FilterBasicProductSetrequest filterBasicProductSetrequest) {
|
||||
List<BasicProductSetEntity> basicProductSetEntities = basicProductSetService.filterSetup(filterBasicProductSetrequest);
|
||||
PageInfo<BasicProductSetEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(basicProductSetEntities);
|
||||
PageSimpleResponse<BasicProductSetEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(basicProductSetEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/spms/basicProduct/setup/modify")
|
||||
public BaseResponse modifySetup(@RequestBody BasicProductSetEntity basicProductSetEntity) {
|
||||
basicProductSetService.updateSetup(basicProductSetEntity);
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package com.glxp.sale.admin.dao.basic;
|
||||
|
||||
import com.glxp.sale.admin.entity.basic.CorpImportLogEntity;
|
||||
import com.glxp.sale.admin.entity.basic.NewUploadDiEntity;
|
||||
import com.glxp.sale.admin.req.basic.FilterNewUploadDiRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface NewUploadDiDao {
|
||||
|
||||
List<NewUploadDiEntity> filterNewUploads(FilterNewUploadDiRequest filterNewUploadDiRequest);
|
||||
|
||||
boolean deleteById(Integer id);
|
||||
|
||||
boolean insertNewUploadDi(NewUploadDiEntity newUploadDiEntity);
|
||||
|
||||
boolean updateNewUploadDi(NewUploadDiEntity newUploadDiEntity);
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package com.glxp.sale.admin.dao.info;
|
||||
|
||||
import com.glxp.sale.admin.entity.info.BasicProductSetEntity;
|
||||
import com.glxp.sale.admin.req.info.FilterBasicProductSetrequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface BasicProductSetDao {
|
||||
|
||||
List<BasicProductSetEntity> filterSetup(FilterBasicProductSetrequest filterBasicProductSetrequest);
|
||||
|
||||
boolean updateSetup(BasicProductSetEntity basicProductSetEntity);
|
||||
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package com.glxp.sale.admin.entity.basic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class NewUploadDiEntity {
|
||||
private Integer id;
|
||||
private String relId;
|
||||
private String thirdSysFk;
|
||||
private Integer uploadStatus;
|
||||
private String uploadMsg;
|
||||
private String uploadCode;
|
||||
private String remark;
|
||||
private Date updateTime;
|
||||
private Date submitTime;
|
||||
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package com.glxp.sale.admin.entity.info;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class BasicProductSetEntity {
|
||||
|
||||
private Integer id;
|
||||
private String parmName;
|
||||
private String parmKey;
|
||||
private boolean enable;
|
||||
private boolean supSelect;
|
||||
private boolean supAdd;
|
||||
private boolean localAdd;
|
||||
private boolean localEdit;
|
||||
private String remark;
|
||||
private Integer sort;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package com.glxp.sale.admin.req.basic;
|
||||
|
||||
import com.glxp.sale.admin.req.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FilterNewUploadDiRequest extends ListPageRequest {
|
||||
|
||||
private Integer id;
|
||||
private String relId;
|
||||
private String thirdSysFk;
|
||||
private String uploadStatus;
|
||||
private String uploadCode;
|
||||
private String lastUpdateTime;
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package com.glxp.sale.admin.req.basic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
//选入产品补充信息
|
||||
@Data
|
||||
public class SupplementRequest {
|
||||
|
||||
//补充信息：
|
||||
private String basicPrductRemak1;
|
||||
private String basicPrductRemak2;
|
||||
private String basicPrductRemak3;
|
||||
private String basicPrductRemak4;
|
||||
private String basicPrductRemak5;
|
||||
private String basicPrductRemak6;
|
||||
private String basicPrductRemak7;
|
||||
private String basicPrductRemak8;
|
||||
private String sptm;
|
||||
private String ybbm;
|
||||
private String measname;
|
||||
private String manufactory;
|
||||
private String spmc;
|
||||
private String cpms;
|
||||
private String price;
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package com.glxp.sale.admin.req.info;
|
||||
|
||||
import com.glxp.sale.admin.req.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FilterBasicProductSetrequest extends ListPageRequest {
|
||||
|
||||
|
||||
String parmName;
|
||||
Boolean enable;
|
||||
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package com.glxp.sale.admin.service.basic;
|
||||
|
||||
import com.glxp.sale.admin.entity.basic.NewUploadDiEntity;
|
||||
import com.glxp.sale.admin.req.basic.FilterNewUploadDiRequest;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface NewUploadDiService {
|
||||
|
||||
|
||||
List<NewUploadDiEntity> filterNewUploads(FilterNewUploadDiRequest filterNewUploadDiRequest);
|
||||
|
||||
boolean deleteById(Integer id);
|
||||
|
||||
boolean insertNewUploadDi(NewUploadDiEntity newUploadDiEntity);
|
||||
|
||||
boolean updateNewUploadDi(NewUploadDiEntity newUploadDiEntity);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
package com.glxp.sale.admin.service.basic.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.sale.admin.dao.basic.NewUploadDiDao;
|
||||
import com.glxp.sale.admin.entity.basic.CorpImportLogEntity;
|
||||
import com.glxp.sale.admin.entity.basic.NewUploadDiEntity;
|
||||
import com.glxp.sale.admin.entity.basic.UdiInfoImportLogEntity;
|
||||
import com.glxp.sale.admin.req.basic.FilterNewUploadDiRequest;
|
||||
import com.glxp.sale.admin.service.basic.NewUploadDiService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class NewUploadDiServiceImpl implements NewUploadDiService {
|
||||
@Resource
|
||||
NewUploadDiDao newUploadDiDao;
|
||||
|
||||
@Override
|
||||
public List<NewUploadDiEntity> filterNewUploads(FilterNewUploadDiRequest filterNewUploadDiRequest) {
|
||||
|
||||
if (filterNewUploadDiRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (filterNewUploadDiRequest.getPage() != null) {
|
||||
int offset = (filterNewUploadDiRequest.getPage() - 1) * filterNewUploadDiRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterNewUploadDiRequest.getLimit());
|
||||
}
|
||||
List<NewUploadDiEntity> data = newUploadDiDao.filterNewUploads(filterNewUploadDiRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteById(Integer id) {
|
||||
return newUploadDiDao.deleteById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertNewUploadDi(NewUploadDiEntity newUploadDiEntity) {
|
||||
return newUploadDiDao.insertNewUploadDi(newUploadDiEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean updateNewUploadDi(NewUploadDiEntity newUploadDiEntity) {
|
||||
return newUploadDiDao.updateNewUploadDi(newUploadDiEntity);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package com.glxp.sale.admin.service.info;
|
||||
|
||||
import com.glxp.sale.admin.entity.info.BasicProductSetEntity;
|
||||
import com.glxp.sale.admin.req.info.FilterBasicProductSetrequest;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface BasicProductSetService {
|
||||
|
||||
List<BasicProductSetEntity> filterSetup(FilterBasicProductSetrequest filterBasicProductSetrequest);
|
||||
|
||||
Map<String, BasicProductSetEntity> filterAllEnable();
|
||||
|
||||
|
||||
boolean updateSetup(BasicProductSetEntity basicProductSetEntity);
|
||||
|
||||
}
|
||||
@ -0,0 +1,58 @@
|
||||
package com.glxp.sale.admin.service.info.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.sale.admin.dao.info.BasicProductSetDao;
|
||||
import com.glxp.sale.admin.entity.info.BasicProductSetEntity;
|
||||
import com.glxp.sale.admin.req.info.FilterBasicProductSetrequest;
|
||||
import com.glxp.sale.admin.service.info.BasicProductSetService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class BasicProductSetServiceImpl implements BasicProductSetService {
|
||||
@Resource
|
||||
BasicProductSetDao basicProductSetDao;
|
||||
|
||||
@Override
|
||||
public List<BasicProductSetEntity> filterSetup(FilterBasicProductSetrequest filterBasicProductSetrequest) {
|
||||
if (filterBasicProductSetrequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (filterBasicProductSetrequest.getPage() != null) {
|
||||
int offset = (filterBasicProductSetrequest.getPage() - 1) * filterBasicProductSetrequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterBasicProductSetrequest.getLimit());
|
||||
}
|
||||
return basicProductSetDao.filterSetup(filterBasicProductSetrequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, BasicProductSetEntity> filterAllEnable() {
|
||||
|
||||
FilterBasicProductSetrequest filterBasicProductSetrequest = new FilterBasicProductSetrequest();
|
||||
filterBasicProductSetrequest.setEnable(true);
|
||||
List<BasicProductSetEntity> basicProductSetEntities = basicProductSetDao.filterSetup(filterBasicProductSetrequest);
|
||||
|
||||
Map<String, BasicProductSetEntity> basicProductSetEntityMap = new HashMap<>();
|
||||
|
||||
if (CollUtil.isNotEmpty(basicProductSetEntities)) {
|
||||
for (BasicProductSetEntity basicProductSetEntity : basicProductSetEntities) {
|
||||
basicProductSetEntityMap.put(basicProductSetEntity.getParmKey(), basicProductSetEntity);
|
||||
}
|
||||
}
|
||||
|
||||
return basicProductSetEntityMap;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean updateSetup(BasicProductSetEntity basicProductSetEntity) {
|
||||
return basicProductSetDao.updateSetup(basicProductSetEntity);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,177 @@
|
||||
package com.glxp.sale.admin.util;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.glxp.sale.admin.entity.info.BasicProductSetEntity;
|
||||
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
|
||||
import com.glxp.sale.admin.req.basic.SupplementRequest;
|
||||
import com.glxp.sale.admin.service.info.BasicProductSetService;
|
||||
import com.glxp.sale.admin.service.param.SystemParamConfigService;
|
||||
import com.glxp.sale.common.res.BaseResponse;
|
||||
import com.glxp.sale.common.util.ResultVOUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class SupplementVailUtil {
|
||||
|
||||
@Resource
|
||||
BasicProductSetService basicProductSetService;
|
||||
@Resource
|
||||
SystemParamConfigService systemParamConfigService;
|
||||
|
||||
|
||||
public static final int SUP_SELECT = 1;
|
||||
public static final int SUP_ADD = 2;
|
||||
public static final int LOCAL_ADD = 3;
|
||||
public static final int LOCAL_EIDT = 4;
|
||||
|
||||
|
||||
public String vail(SupplementRequest supplementRequest, int type) {
|
||||
//验证产品信息是否必填
|
||||
Map<String, BasicProductSetEntity> basicProductSetEntityMap = basicProductSetService.filterAllEnable();
|
||||
Map<String, SystemParamConfigEntity> systemParamConfigEntityMap = systemParamConfigService.findBasicAll();
|
||||
if (basicProductSetEntityMap.size() > 0) {
|
||||
BasicProductSetEntity basicProductSetEntity = null;
|
||||
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("sptm");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getSptm())) {
|
||||
return "商品条码不能为空";
|
||||
}
|
||||
}
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("ybbm");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getYbbm())) {
|
||||
return "医保编码不能为空";
|
||||
}
|
||||
}
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("measname");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getMeasname())) {
|
||||
return "计量单位不能为空";
|
||||
}
|
||||
}
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("manufactory");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getManufactory())) {
|
||||
return "生产企业不能为空";
|
||||
}
|
||||
}
|
||||
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("spmc");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getSpmc())) {
|
||||
return "商品名称不能为空";
|
||||
}
|
||||
}
|
||||
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("cpms");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getCpms())) {
|
||||
return "产品描述不能为空";
|
||||
}
|
||||
}
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("price");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getPrice())) {
|
||||
return "产品价格不能为空";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak1");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak1())) {
|
||||
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak1");
|
||||
if (!systemParamConfigEntity.getParamValue().equals("0")) {
|
||||
return systemParamConfigEntity.getParamValue() + "不能为空";
|
||||
}
|
||||
}
|
||||
}
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak2");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak2())) {
|
||||
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak2");
|
||||
if (!systemParamConfigEntity.getParamValue().equals("0")) {
|
||||
return systemParamConfigEntity.getParamValue() + "不能为空";
|
||||
}
|
||||
}
|
||||
}
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak3");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak3())) {
|
||||
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak3");
|
||||
if (!systemParamConfigEntity.getParamValue().equals("0")) {
|
||||
return systemParamConfigEntity.getParamValue() + "不能为空";
|
||||
}
|
||||
}
|
||||
}
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak4");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak4())) {
|
||||
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak4");
|
||||
if (!systemParamConfigEntity.getParamValue().equals("0")) {
|
||||
return systemParamConfigEntity.getParamValue() + "不能为空";
|
||||
}
|
||||
}
|
||||
}
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak5");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak5())) {
|
||||
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak5");
|
||||
if (!systemParamConfigEntity.getParamValue().equals("0")) {
|
||||
return systemParamConfigEntity.getParamValue() + "不能为空";
|
||||
}
|
||||
}
|
||||
}
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak6");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak6())) {
|
||||
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak6");
|
||||
if (!systemParamConfigEntity.getParamValue().equals("0")) {
|
||||
return systemParamConfigEntity.getParamValue() + "不能为空";
|
||||
}
|
||||
}
|
||||
}
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak7");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak7())) {
|
||||
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak7");
|
||||
if (!systemParamConfigEntity.getParamValue().equals("0")) {
|
||||
return systemParamConfigEntity.getParamValue() + "不能为空";
|
||||
}
|
||||
}
|
||||
}
|
||||
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak8");
|
||||
if (isMustFill(type, basicProductSetEntity)) {
|
||||
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak8())) {
|
||||
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak8");
|
||||
if (!systemParamConfigEntity.getParamValue().equals("0")) {
|
||||
return systemParamConfigEntity.getParamValue() + "不能为空";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public boolean isMustFill(int type, BasicProductSetEntity basicProductSetEntity) {
|
||||
if (basicProductSetEntity == null)
|
||||
return false;
|
||||
if (type == SUP_SELECT && basicProductSetEntity.isSupSelect()) {
|
||||
return true;
|
||||
} else if (type == SUP_ADD && basicProductSetEntity.isSupAdd()) {
|
||||
return true;
|
||||
} else if (type == LOCAL_ADD && basicProductSetEntity.isLocalAdd()) {
|
||||
return true;
|
||||
} else if (type == LOCAL_EIDT && basicProductSetEntity.isLocalEdit()) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,65 @@
|
||||
<?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.glxp.sale.admin.dao.basic.NewUploadDiDao">
|
||||
|
||||
<select id="filterNewUploads" parameterType="com.glxp.sale.admin.req.basic.FilterNewUploadDiRequest"
|
||||
resultType="com.glxp.sale.admin.entity.basic.NewUploadDiEntity">
|
||||
SELECT * FROM basic_new_udi_upload
|
||||
<where>
|
||||
<if test="id != '' and id != null">
|
||||
AND id = #{id}
|
||||
</if>
|
||||
<if test="relId != '' and relId != null">
|
||||
AND relId = #{relId}
|
||||
</if>
|
||||
<if test="thirdSysFk != '' and thirdSysFk != null">
|
||||
AND thirdSysFk = #{thirdSysFk}
|
||||
</if>
|
||||
<if test="uploadStatus != '' and uploadStatus != null">
|
||||
AND uploadStatus = #{uploadStatus}
|
||||
</if>
|
||||
<if test="uploadCode != '' and uploadCode != null">
|
||||
AND uploadCode = #{uploadCode}
|
||||
</if>
|
||||
<if test="lastUpdateTime!=null and lastUpdateTime!=''">
|
||||
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY updateTime DESC
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insertNewUploadDi" keyProperty="id" parameterType="com.glxp.sale.admin.entity.basic.NewUploadDiEntity">
|
||||
insert INTO basic_new_udi_upload
|
||||
(relId, thirdSysFk, uploadStatus, uploadMsg, uploadCode, remark, updateTime, submitTime)
|
||||
values (#{relId},
|
||||
#{thirdSysFk},
|
||||
#{uploadStatus},
|
||||
#{uploadMsg}, #{uploadCode}, #{remark}, #{updateTime}, #{submitTime})
|
||||
</insert>
|
||||
|
||||
|
||||
<delete id="deleteById" parameterType="Map">
|
||||
DELETE
|
||||
FROM basic_new_udi_upload
|
||||
WHERE id = #{id}
|
||||
</delete>
|
||||
|
||||
<update id="updateNewUploadDi" parameterType="com.glxp.sale.admin.entity.basic.NewUploadDiEntity">
|
||||
UPDATE basic_new_udi_upload
|
||||
<set>
|
||||
<if test="relId != null">relId=#{relId},</if>
|
||||
<if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
|
||||
<if test="updateTime != null">updateTime=#{updateTime},</if>
|
||||
<if test="uploadStatus != null">uploadStatus=#{uploadStatus},</if>
|
||||
<if test="uploadMsg != null">uploadMsg=#{uploadMsg},</if>
|
||||
<if test="uploadCode != null">uploadCode=#{uploadCode},</if>
|
||||
<if test="remark != null">remark=#{remark},</if>
|
||||
<if test="updateTime != null">updateTime=#{updateTime},</if>
|
||||
<if test="submitTime != null">submitTime=#{submitTime},</if>
|
||||
</set>
|
||||
WHERE id = #{id}
|
||||
</update>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,42 @@
|
||||
<?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.glxp.sale.admin.dao.info.BasicProductSetDao">
|
||||
|
||||
|
||||
<select id="filterSetup"
|
||||
parameterType="com.glxp.sale.admin.req.info.FilterBasicProductSetrequest"
|
||||
resultType="com.glxp.sale.admin.entity.info.BasicProductSetEntity">
|
||||
SELECT *
|
||||
FROM basic_product_set
|
||||
<where>
|
||||
<if test="parmName != '' and parmName!=null">
|
||||
and udiRlIdFk = #{udiRlIdFk}
|
||||
</if>
|
||||
<if test="enable != null ">
|
||||
and enable = #{enable}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY sort
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="updateSetup" parameterType="com.glxp.sale.admin.entity.info.BasicProductSetEntity">
|
||||
replace
|
||||
INTO basic_product_set(parmName,
|
||||
parmKey,enable,supSelect,supAdd,localAdd,remark,sort,localEdit) values
|
||||
(
|
||||
#{parmName},
|
||||
#{parmKey},
|
||||
#{enable} ,
|
||||
#{supSelect},
|
||||
#{supAdd},
|
||||
#{localAdd},
|
||||
#{remark},
|
||||
#{sort},
|
||||
#{localEdit}
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue