Merge remote-tracking branch 'origin/master'

master
chengqf 2 years ago
commit 6028bb64f3

@ -291,6 +291,10 @@ public class DeptController extends BaseController {
if (CollUtil.isNotEmpty(deptUserEntities)) {
return ResultVOUtils.error(500, "删除失败,请先移除该部门关联用户信息!");
}
List<DeptEntity> deptEntities = deptService.selectByPcode(deptEntity.getCode());
if(deptEntities.size()>0){
return ResultVOUtils.error(500, "删除失败,请先移除该部门下的子部门!");
}
boolean b = deptService.deleteById(deleteRequest.getId());

@ -71,7 +71,6 @@ public class InvWarehouseController extends BaseController {
return ResultVOUtils.success(responses);
}
/**
* -
*

@ -59,6 +59,8 @@ public class LoginController extends BaseController {
private CompanyService companyService;
@Resource
private AuthLicenseDao authLicenseDao;
@Resource
private UserRegisterService userRegisterService;
/**
@ -76,7 +78,12 @@ public class LoginController extends BaseController {
AuthAdmin authAdmin = authAdminService.findByUserName(loginRequest.getUsername());
if (authAdmin == null) {
throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
UserRegisterEntity userRegisterEntity=userRegisterService.selectByUserName(loginRequest.getUsername());
if(userRegisterEntity!=null){
throw new JsonException(ResultEnum.DATA_NOT, "该账号未通过审核!");
}else {
throw new JsonException(ResultEnum.DATA_NOT, "该账号未注册!");
}
}
if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) {

@ -67,7 +67,12 @@ public class SysUserController extends BaseController {
AuthAdminResponse authAdminResponse = new AuthAdminResponse();
BeanUtils.copyProperties(item, authAdminResponse);
List<Long> roles = sysRoleService.selectRoleListByUserId(authAdminResponse.getId());
List<DeptUserResponse> deptUserResponses = deptUserService.selectByUserId(authAdminResponse.getId());
List<DeptUserResponse> deptUserResponses=null;
if("key".equals(filterAuthUserRequest.getKey())){
deptUserResponses = deptUserService.selectByUserIdKey(authAdminResponse.getId());
}else{
deptUserResponses = deptUserService.selectByUserId(authAdminResponse.getId());
}
if (CollUtil.isNotEmpty(deptUserResponses)) {
List<Long> depts = new ArrayList<>();
String deptName = "";

@ -2,11 +2,11 @@ package com.glxp.api.controller.basic;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.file.FileWriter;
import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.dao.basic.UdiProductDao;
import com.glxp.api.dao.basic.UdiRelevanceDao;
@ -14,7 +14,10 @@ import com.glxp.api.dao.thrsys.ThrCorpDao;
import com.glxp.api.dao.thrsys.ThrProductsDao;
import com.glxp.api.entity.basic.*;
import com.glxp.api.entity.thrsys.ThrProductsEntity;
import com.glxp.api.req.basic.*;
import com.glxp.api.req.basic.BasicCorpsExportRequest;
import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.req.basic.UdiInfoExportRequest;
import com.glxp.api.req.thrsys.FilterThrCorpRequest;
import com.glxp.api.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.res.basic.BasicCorpExportLogResponse;
@ -159,6 +162,9 @@ public class BasicGenJsonService {
File file = new File(basicProductsExportLogEntity.getFilePath());
if (!file.exists()) {
try {
if (!FileUtil.exist(file.getParentFile())) {
FileUtil.mkdir(file.getParentFile());
}
file.createNewFile();
} catch (Exception e) {
log.error("导出医疗器械信息异常", e);

@ -19,6 +19,7 @@ import com.glxp.api.res.basic.UdiRlDlResponse;
import com.glxp.api.service.basic.BasicProductsExportLogService;
import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.util.CustomUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
@ -38,6 +39,7 @@ import java.util.stream.Collectors;
/**
*
*/
@Slf4j
@RestController
public class BasicProductsExportLogController {
@ -111,7 +113,7 @@ public class BasicProductsExportLogController {
}
basicProductsExportLogService.updateUdiInfoExportLog(basicProductsExportLogEntity);
} catch (Exception ex) {
System.out.println("下载失败!");
log.error("下载产品信息导出数据异常", ex);
}

@ -100,7 +100,7 @@ public class SupCertController {
if (postSelCertRequest.getCertType() == null) {
return ResultVOUtils.error(500, "参数错误!");
}
if (postSelCertRequest.getManufacturerIdFk() == null) {
String errMsg = "";
ArrayList<String> list = new ArrayList<>();
int i = postSelCertRequest.getSupCertSetEntities().size();
@ -120,7 +120,7 @@ public class SupCertController {
}
}
}
}
for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) {
@ -219,6 +219,13 @@ public class SupCertController {
public BaseResponse updateCompanyCert(@RequestBody PostSupCertRequest postSupCertRequest) {
SupCertEntity supCertEntity = new SupCertEntity();
BeanUtils.copyProperties(postSupCertRequest, supCertEntity);
if(postSupCertRequest.getVailDate().getTime()>postSupCertRequest.getExpireDate().getTime()){
return ResultVOUtils.error(999,"生效期不能小于失效期!");
}
if (postSupCertRequest.getRepeatUpload() == 1) {
//已审核的重新提交
//1.修改对应的资质信息进入变更审核状态,

@ -67,4 +67,6 @@ public interface DeptDao {
* @return
*/
String selectNameByCode(@Param("code") String code);
List<DeptEntity> selectByPcode(@Param("pcode") String pcode);
}

@ -16,6 +16,8 @@ public interface DeptUserDao {
List<DeptUserResponse> selectJoinDeptUser(FilterDeptUserReqeust filterDeptUserReqeust);
List<DeptUserResponse> selectJoinDeptUserKey(FilterDeptUserReqeust filterDeptUserReqeust);
boolean delete(@Param("deptId") Long deptId, @Param("userId") Long userId);
int deleteById(Integer id);

@ -14,7 +14,7 @@ public interface UserRegisterDao {
UserRegisterEntity selectByCname(String cName);
UserRegisterEntity selectByUserName(String userName);
boolean insertUserRegister(UserRegisterEntity userRegisterEntity);

@ -6,19 +6,10 @@ package com.glxp.api.idc.utils;
public class TableUtils {
/*同步表,格式:同步设置表列名/同步设置表列名(子表时设置,主表不设置)/主表唯一列(多列逗号分隔)/主表关联列/子表关联列/数据库实际表/时间列/图片或文件列/数据条件/说明*/
private static final String[] SYNC_TABLES = {
"entrustAction//basic_entrust_accept/id///updateTime///委托验收",
"basicProducts//basic_udirel/id///updateTime///耗材字典",
"/basicProducts/basic_products/id/uuid/uuid////耗材字典信息详情",
"basicCorp//basic_corp/id///updateTime///往来单位",
"//company_product_relevance/id///updateTime///供应商关联信息",
"typeThird//thr_bustype_origin/id///updateTime///第三方单据类型",
"basicThirdCorp//thr_corp/id///updateTime///第三方往来单位",
"//thr_dept/id///updateTime///第三方部门",
"//thr_inv_products/id///updateTime///第三方库存",
"basicThirdInv//thr_inv_warehouse/id//////第三方仓库",
"basicThirdBusOrder//thr_order/id///updateTime///第三方业务单据",
"/basicThirdBusOrder/thr_order_detail/orderIdFk/id/orderIdFk/updateTime///第三方单据详情",
"basicThirdProducts//thr_products/id///updateTime///第三方产品信息",
"//sup_cert_set/id///updateTime///供应商资质证书设置",
"companyCert//sup_company/customerId///updateTime///配送企业",
"manufacturerCert//sup_manufacturer/id///updateTime///生产企业",
@ -28,10 +19,21 @@ public class TableUtils {
"/productCert/sup_cert/id/productId/productIdFk/updateTime/filePath/type=3/产品资质证书信息",
"//udicompany/id///updateTime///国际库医疗器械注册人信息",
"basicType//basic_hosp_type/id///updateTime///物资字典分类",
"basicDept//auth_dept/id///updateTime///部门信息",
};
/**
* "typeThird//thr_bustype_origin/id///updateTime///第三方单据类型",
* "basicThirdCorp//thr_corp/id///updateTime///第三方往来单位",
* "//thr_dept/id///updateTime///第三方部门",
* "//thr_inv_products/id///updateTime///第三方库存",
* "basicThirdInv//thr_inv_warehouse/id//////第三方仓库",
* "basicThirdBusOrder//thr_order/id///updateTime///第三方业务单据",
* "/basicThirdBusOrder/thr_order_detail/orderIdFk/id/orderIdFk/updateTime///第三方单据详情",
* "basicThirdProducts//thr_products/id///updateTime///第三方产品信息",
* "basicDept//auth_dept/id///updateTime///部门信息",
* "basicInv//auth_warehouse/id///updateTime///仓库信息",
*/
// "entrustAction//basic_entrust_accept/id///updateTime///委托验收",
// "basicInv//auth_warehouse/id///updateTime///仓库信息",
//"dbDiProducts//productinfo/id///updateTime///DI产品信息",
//"basicInv/////////仓库字典",

@ -33,4 +33,6 @@ public class FilterAuthUserRequest extends ListPageRequest {
private String deptCode;
private String invCode; //仓库号
private String key;
}

@ -75,4 +75,6 @@ public interface DeptService {
List<DeptEntity> getDeptById( List<Integer> ids);
List<DeptEntity> selectByPcode(String pcode);
}

@ -15,6 +15,8 @@ public interface DeptUserService {
List<DeptUserResponse> selectByUserId(Long userId);
List<DeptUserResponse> selectByUserIdKey(Long userId);
List<DeptEntity> getDeptById( List<Integer> ids);
List<DeptUserResponse> selectJoinDeptUser(FilterDeptUserReqeust filterDeptUserReqeust);

@ -17,6 +17,8 @@ public interface UserRegisterService {
boolean deleteById(Long id);
UserRegisterEntity selectByUserName(String userName);
boolean deleteByMobile(String phone,Integer checkType);
UserRegisterEntity selectById(Integer id);

@ -51,13 +51,6 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
int offset = (customerInfoFilterRequest.getPage() - 1) * customerInfoFilterRequest.getLimit();
PageHelper.offsetPage(offset, customerInfoFilterRequest.getLimit());
List<CustomerDetailEntity> customerDetailEntities = customerInfoDao.filterDetailCustomerInfo(customerInfoFilterRequest);
for (int i = 0; i < customerDetailEntities.size(); i++) {
CustomerDetailEntity customerDetailEntity = customerDetailEntities.get(i);
if (!customerDetailEntity.getRoleId().equals("null") && !customerDetailEntity.getRoleId().equals("") && customerDetailEntity.getRoleId() != null) {
}
}
return customerDetailEntities;
}

@ -177,4 +177,11 @@ public class DeptServiceImpl implements DeptService {
public List<DeptEntity> getDeptById(List<Integer> ids) {
return deptDao.getDeptById(ids);
}
@Override
public List<DeptEntity> selectByPcode(String pcode) {
return deptDao.selectByPcode(pcode);
}
}

@ -42,6 +42,13 @@ public class DeptUserServiceImpl implements DeptUserService {
return deptUserDao.selectJoinDeptUser(filterDeptUserReqeust);
}
@Override
public List<DeptUserResponse> selectByUserIdKey(Long userId) {
FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
filterDeptUserReqeust.setUserId(userId);
return deptUserDao.selectJoinDeptUserKey(filterDeptUserReqeust);
}
@Override
public List<DeptEntity> getDeptById(List<Integer> ids) {
return deptDao.getDeptById(ids);

@ -50,6 +50,11 @@ public class UserRegisterServiceImpl implements UserRegisterService {
return userRegisterDao.deleteById(id);
}
@Override
public UserRegisterEntity selectByUserName(String userName) {
return userRegisterDao.selectByUserName(userName);
}
@Override
public boolean deleteByMobile(String phone, Integer checkType) {
return userRegisterDao.deleteByMobile(phone,checkType);

@ -68,7 +68,6 @@ public class InvRemindSetServiceImpl implements InvRemindSetService {
.eq("invCode", addInvRemindSetRequest.getInvCode())
.eq(StrUtil.isNotBlank(addInvRemindSetRequest.getInvSpaceCode()), "invSpaceCode", addInvRemindSetRequest.getInvSpaceCode())
.eq(StrUtil.isNotBlank(addInvRemindSetRequest.getRelId()), "relId", addInvRemindSetRequest.getRelId())
.eq(StrUtil.isNotBlank(addInvRemindSetRequest.getGgxh()), "ggxh", addInvRemindSetRequest.getGgxh())
);
if (null == invRemindSetEntity) {
invRemindSetEntity = new InvRemindSetEntity();

@ -85,7 +85,6 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService {
}
@Override
public Map<String, SystemParamConfigEntity> findBasicAll() {

@ -308,4 +308,8 @@
<select id="selectNameByCode" resultType="java.lang.String">
select name from auth_dept where code = #{code}
</select>
<select id="selectByPcode" resultType="com.glxp.api.entity.auth.DeptEntity">
select * from auth_dept where pcode = #{pcode}
</select>
</mapper>

@ -41,7 +41,32 @@
auth_user.employeeName like concat('%', #{key}, '%'))
</if>
</where>
group by auth_dept_user.userId
</select>
<select id="selectJoinDeptUserKey" parameterType="com.glxp.api.req.auth.FilterDeptUserReqeust"
resultType="com.glxp.api.res.auth.DeptUserResponse">
SELECT auth_dept_user.*,
auth_user.userName,
auth_user.employeeName,
auth_dept.`name` deptName,
auth_user.comments
FROM auth_dept_user
left JOIN auth_user
on auth_dept_user.userId = auth_user.id
left JOIN auth_dept on auth_dept_user.deptId = auth_dept.id
<where>
<if test="deptId != null">
and deptId = #{deptId}
</if>
<if test="userId != null">
and userId = #{userId}
</if>
<if test="key != null and key != ''">
and (auth_user.userName like concat('%', #{key}, '%') or
auth_user.employeeName like concat('%', #{key}, '%'))
</if>
</where>
</select>

@ -299,7 +299,8 @@
AND a.advanceType = #{advanceType}
</if>
<if test="key != null and key != ''">
AND a.name like concat('%', #{key}, '%')
AND (a.name like concat('%', #{key}, '%') or
a.code = #{key})
</if>
</where>
</select>

@ -24,6 +24,13 @@
where companyName=#{cName}
</select>
<select id="selectByUserName" parameterType="java.lang.String"
resultType="com.glxp.api.entity.auth.UserRegisterEntity">
SELECT *
FROM user_register
where userName=#{userName}
</select>
<insert id="insertUserRegister" keyProperty="id" parameterType="com.glxp.api.entity.auth.UserRegisterEntity">

@ -58,75 +58,31 @@
<insert id="insertIgnoreBussinessType" parameterType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
insert
ignore
into basic_bussiness_type (mainAction, action, name, enable, remark, thirdSysFk, genUnit,
innerOrder, secCheckEnable, checkEnable, checkUdims, checkPdaEd,
checkPdaUn, checkPc, checkWebNew, checkSp, checkChange, secCheckUdims,
secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew,
secCheckChange, secCheckSp, corpType, supplementOrderType,
checkBalance, secCheckBalance, useDyCount, expireTip, updateTime,
defaultUnit, prefix, outToSpms, ullageFill, scanPreIn, vailInv,
ignore
into basic_bussiness_type (mainAction, action, name, enable, remark, thirdSysFk, genUnit, innerOrder,
secCheckEnable, checkEnable, checkUdims, checkPdaEd, checkPdaUn, checkPc,
checkWebNew, checkSp, checkChange, secCheckUdims, secCheckPdaEd, secCheckPdaUn,
secCheckPc, secCheckWebNew, secCheckChange, secCheckSp, corpType,
supplementOrderType, checkBalance, secCheckBalance, useDyCount, expireTip,
updateTime, defaultUnit, prefix, outToSpms, ullageFill, scanPreIn, vailInv,
entrutSpms, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType,
checkCopy, secCheckCopy, originAction, changeEnable,
spUse, preIn, supplementAll, createUser, createTime, preInBack, vailDispatch,
vailGroupBuy, busType, inStock, actionType
, thrCheckEnable, thrCheckWebNew, thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp
, thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, checkCertExpire)
values (#{mainAction},
#{action},
#{name},
#{enable},
#{remark},
#{thirdSysFk},
#{genUnit},
#{innerOrder},
#{secCheckEnable},
#{checkEnable},
#{checkUdims},
#{checkPdaEd},
#{checkPdaUn},
#{checkPc},
#{checkWebNew},
#{checkSp},
#{checkChange},
#{secCheckUdims},
#{secCheckPdaEd},
#{secCheckPdaUn},
#{secCheckPc},
#{secCheckWebNew},
#{secCheckChange},
#{secCheckSp},
#{corpType},
#{supplementOrderType},
#{checkBalance},
#{secCheckBalance},
#{useDyCount},
#{expireTip},
#{updateTime},
#{defaultUnit},
#{prefix},
#{outToSpms},
#{ullageFill},
#{scanPreIn},
#{vailInv},
#{entrutSpms},
#{codeFillCheck},
#{defaultSubInv},
#{defaultInv},
#{orderVisibleType},
#{checkCopy},
#{secCheckCopy},
#{originAction},
#{changeEnable},
#{spUse},
#{preIn},
#{supplementAll},
#{createUser},
#{createTime}, #{preInBack}, #{vailDispatch}, #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType}
, #{thrCheckEnable}, #{thrCheckWebNew}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims},
#{thrCheckPc}
, #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}
, #{checkVailDate}, #{checkExpire}, #{checkCertExpire})
preInBack, supplementAll, createUser, createTime, updateUser, vailDispatch,
vailGroupBuy, busType, inStock, actionType, thrCheckEnable, thrCheckWebNew,
thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp,
thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate,
checkExpire, checkCertExpire)
values (#{mainAction}, #{action}, #{name}, #{enable}, #{remark}, #{thirdSysFk}, #{genUnit}, #{innerOrder},
#{secCheckEnable}, #{checkEnable}, #{checkUdims}, #{checkPdaEd}, #{checkPdaUn}, #{checkPc},
#{checkWebNew}, #{checkSp}, #{checkChange}, #{secCheckUdims}, #{secCheckPdaEd}, #{secCheckPdaUn},
#{secCheckPc}, #{secCheckWebNew}, #{secCheckChange}, #{secCheckSp}, #{corpType},
#{supplementOrderType}, #{checkBalance}, #{secCheckBalance}, #{useDyCount}, #{expireTip},
#{updateTime}, #{defaultUnit}, #{prefix}, #{outToSpms}, #{ullageFill}, #{scanPreIn}, #{vailInv},
#{entrutSpms}, #{codeFillCheck}, #{defaultSubInv}, #{defaultInv}, #{orderVisibleType},
#{preInBack}, #{supplementAll}, #{createUser}, #{createTime}, #{updateUser}, #{vailDispatch},
#{vailGroupBuy}, #{busType}, #{inStock}, #{actionType}, #{thrCheckEnable}, #{thrCheckWebNew},
#{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, #{thrCheckPc}, #{thrCheckSp},
#{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}, #{checkVailDate},
#{checkExpire}, #{checkCertExpire})
</insert>
<select id="selectBusList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@ -182,9 +138,8 @@
<select id="selectForThirdSys" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
select action, name
from basic_bussiness_type
where action not in (
select code
from thr_system_bus_api)
where action not in (select code
from thr_system_bus_api)
</select>
<select id="selectCandidateBusType" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@ -193,13 +148,13 @@
where mainAction = #{mainAction}
and corpType = 3
and (supplementOrderType is null
or supplementOrderType = '')
or supplementOrderType = '')
</select>
<select id="selectByUser" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
select basic_bussiness_type.*
from basic_bussiness_type
inner join auth_user_bustype on basic_bussiness_type.action = auth_user_bustype.scAction
inner join auth_user_bustype on basic_bussiness_type.action = auth_user_bustype.scAction
<where>
<if test="name != null and name != ''">
AND basic_bussiness_type.name like concat('%', #{name}, '%')
@ -230,7 +185,7 @@
resultType="com.glxp.api.res.basic.BasicBussinessTypeResponse">
SELECT basic_bussiness_type.*
FROM basic_bussiness_type
left JOIN auth_user_bustype ON basic_bussiness_type.action = auth_user_bustype.scAction
left JOIN auth_user_bustype ON basic_bussiness_type.action = auth_user_bustype.scAction
<where>
<if test="name != ''and name != null">
AND basic_bussiness_type.name LIKE concat('%', #{name}, '%')
@ -268,7 +223,7 @@
resultType="com.glxp.api.res.basic.BasicBussinessTypeResponse">
SELECT basic_bussiness_type.*
FROM basic_bussiness_type
left JOIN auth_warehouse_bustype ON basic_bussiness_type.action = auth_warehouse_bustype.action
left JOIN auth_warehouse_bustype ON basic_bussiness_type.action = auth_warehouse_bustype.action
<where>
<if test="name != ''and name != null">
AND basic_bussiness_type.name LIKE concat('%', #{name}, '%')
@ -310,7 +265,7 @@
select *
from basic_bussiness_type
<where>
<if test="list != null and list.size()!=0">
<if test="list != null and list.size() != 0">
and action not in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
@ -318,5 +273,4 @@
</if>
</where>
</select>
</mapper>

@ -90,16 +90,21 @@
</if>
<if test="supInoivceSearch != null">
AND ((`action` in
<foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
and status = 10) or ((
`action` in
<foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>) and status = 7
<if test="invoiceActions1 != null and invoiceActions1.size() != 0">
AND ((`action` in
<foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
and status = 10)
</if>
<if test="invoiceActions2 != null and invoiceActions2.size() != 0">
or ((
`action` in
<foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>) and status = 7
))
</if>
</if>
</where>
order by createTime desc

@ -39,7 +39,7 @@
AND a2.nameCode = #{nameCode}
</if>
<if test="spec != null and spec != ''">
AND a2.spec = #{spec}
AND a2.spec like concat('%', #{spec}, '%')
</if>
<if test="fromCorp != null and fromCorp != ''">
AND a1.fromCorp = #{fromCorp}
@ -48,19 +48,19 @@
AND b1.name = #{fromCorpName}
</if>
<if test="manufacturer != null and manufacturer != ''">
AND a2.manufacturer = #{manufacturer}
AND a2.manufacturer like concat('%', #{manufacturer}, '%')
</if>
<if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
AND a2.certCode = #{zczbhhzbapzbh}
AND a2.certCode like concat('%', #{zczbhhzbapzbh}, '%')
</if>
<if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
AND date_format(a1.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
</if>
<if test="batchNo != null and batchNo != ''">
AND a2.batchNo = #{batchNo}
AND a2.batchNo like concat('%', #{batchNo}, '%')
</if>
<if test="coName != null and coName != ''">
AND a2.coName = #{coName}
AND a2.coName like concat('%', #{coName}, '%')
</if>
<if test="productName != null and productName != ''">
AND a2.coName like concat('%', #{productName}, '%')

@ -19,6 +19,7 @@
AND status= #{status}
</if>
</where>
ORDER BY updateTime DESC
</select>

Loading…
Cancel
Save