Merge remote-tracking branch 'origin/master'

master
wj 2 years ago
commit 3c685f15b4

@ -35,8 +35,6 @@ public class AsyncDiDlHelper {
BaseResponse<List<ProductInfoEntity>> udiDlDeviceResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() {
});
List<ProductInfoEntity> udiInfoEntities = udiDlDeviceResponse.getData();
return udiInfoEntities;
} catch (Exception e) {

@ -84,7 +84,7 @@ public class InvWarehouseController extends BaseController {
if (authAdmin.getCustomerId().equals("110")) {
filterInvWarehouseRequest.setUserId(authAdmin.getId());
} else {
if(filterInvWarehouseRequest.getType()==1){
if (filterInvWarehouseRequest.getType() == 1) {
filterInvWarehouseRequest.setSpUse(true);
}
filterInvWarehouseRequest.setUserId(null);
@ -123,6 +123,7 @@ public class InvWarehouseController extends BaseController {
*
* @return
*/
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/findInvListByUser")
public BaseResponse findInvListByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
Long userId = getUserId();
@ -186,7 +187,7 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("")
@PostMapping("/spms/sub/inv/warehouse/save")
@Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse save(@RequestBody InvWarehouseEntity invWarehouseEntity,
public BaseResponse save(@RequestBody InvWarehouseEntity invWarehouseEntity,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
@ -246,17 +247,16 @@ public class InvWarehouseController extends BaseController {
boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity);
//如果要是一级仓库就吧全部子集都刷成一样的寄售仓库
if(StrUtil.isBlank(invWarehouseEntity.getParentCode())){
List<InvWarehouseEntity> invWarehouseEntityList=invWarehouseService.selectLowWarehouseAll(invWarehouseEntity.getCode());
if (StrUtil.isBlank(invWarehouseEntity.getParentCode())) {
List<InvWarehouseEntity> invWarehouseEntityList = invWarehouseService.selectLowWarehouseAll(invWarehouseEntity.getCode());
for (InvWarehouseEntity obj : invWarehouseEntityList) {
obj.setAdvanceType(invWarehouseEntity.getAdvanceType());
obj.setUpdateTime(new Date());
invWarehouseService.updateInvSubWarehouse(obj);
obj.setAdvanceType(invWarehouseEntity.getAdvanceType());
obj.setUpdateTime(new Date());
invWarehouseService.updateInvSubWarehouse(obj);
}
}
//更新部门信息
DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId());
pEntity.setUpdateTime(new Date());
@ -317,7 +317,7 @@ public class InvWarehouseController extends BaseController {
// 判断此分库中是否还有库存
InvWarehouseEntity byWareId = invWarehouseService.getByWareId(deleteRequest.getId());
List<InvWarehouseEntity> byWarePcode = invWarehouseService.getByWarePcode(byWareId.getCode());
if( byWarePcode.size()>0){
if (byWarePcode.size() > 0) {
return ResultVOUtils.error(500, "此仓库下存在仓库无法删除!");
}
@ -445,9 +445,7 @@ public class InvWarehouseController extends BaseController {
//1.获取所有单据类型
FilterBussinessTypeRequest filterBussinessTypeRequest = new FilterBussinessTypeRequest();
filterBussinessTypeRequest.setEnable(true);
if (invWarehouseEntity.getAdvanceType() == 2) {
filterBussinessTypeRequest.setAdvanceType(2);
}
filterBussinessTypeRequest.setActionType(invWarehouseEntity.getAdvanceType());
List<BasicBussinessTypeEntity> basicBussinessTypeEntities = basicBussinessTypeService.findList(filterBussinessTypeRequest);
//获取仓库关联单据类型
@ -456,6 +454,7 @@ public class InvWarehouseController extends BaseController {
List<WarehouseBussinessTypeEntity> warehouseBussniessTypeList = warehouseBussinessTypeService.getWarehouseBussniessTypeList(filterInvLinkDataRequest);
basicBussinessTypeEntities.forEach(basicBussinessTypeEntity ->
{
for (WarehouseBussinessTypeEntity warehouseBussinessTypeEntity : warehouseBussniessTypeList) {
if (warehouseBussinessTypeEntity.getAction().equals(basicBussinessTypeEntity.getAction())) {

@ -448,7 +448,7 @@ public class BasicBussinessTypeController extends BaseController {
public BaseResponse selectList() {
FilterBussinessTypeRequest bussinessTypeFilterRequest = new FilterBussinessTypeRequest();
bussinessTypeFilterRequest.setAction("2");
bussinessTypeFilterRequest.setActionType(2);
bussinessTypeFilterRequest.setMainAction("WareHouseOut");
bussinessTypeFilterRequest.setCorpType(2);
List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findList(bussinessTypeFilterRequest);

@ -38,6 +38,9 @@ public class UdiSyncController {
AsyncDiDlHelper asyncDiDlHelper;
@Resource
ProductInfoService productInfoService;
@Resource
UdiCompanyService udiCompanyService;
//获取同步库UDI信息
@AuthRuleAnnotation("")
@ -207,4 +210,22 @@ public class UdiSyncController {
}
}
//出入库同步下载
@GetMapping("udidl/udiwms/syncUdi")
public BaseResponse syncUdi(ProductInfoFilterRequest productInfoFilterRequest) {
List<ProductInfoEntity> productInfoEntityList = productInfoService.syncDlUdi(productInfoFilterRequest);
return ResultVOUtils.success(productInfoEntityList);
}
//出入库同步下载
@GetMapping("udidl/udiwms/syncCompany")
public BaseResponse syncCompany(UdiCompanyRequest udiCompanyRequest) {
List<UdiCompanyEntity> udiCompanyEntities = udiCompanyService.syncDlCompany(udiCompanyRequest);
return ResultVOUtils.success(udiCompanyEntities);
}
}

@ -82,6 +82,15 @@ public class IoOrderController extends BaseController {
if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) {
orderService.setInvoiceFiltes(filterOrderRequest);
}
if (filterOrderRequest.getSourceLocalType() != null) {
if (filterOrderRequest.getSourceLocalType() == 1) {
filterOrderRequest.setSourceTypes(Arrays.asList(1, 2, 3, 4, 5));
} else {
filterOrderRequest.setSourceTypes(Arrays.asList(6,7, 8, 9, 10, 11, 12, 13, 14, 15, 17));
}
}
String customerId = getCustomerId();
if (!customerId.equals("110")) {
filterOrderRequest.setFromCorp(customerId);

@ -9,6 +9,7 @@ import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.inv.InvPreProductDetailEntity;
import com.glxp.api.entity.inv.InvPreProductEntity;
import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
@ -40,7 +41,7 @@ import java.util.List;
*/
@Slf4j
@RestController
public class InvPreProductController {
public class InvPreProductController extends BaseController {
@Resource
private InvPreProductService invPreProductService;
@ -70,6 +71,12 @@ public class InvPreProductController {
filterInvPreProductRequest.setInvCodes(invCodes);
}
}
if (isHosUser()) {
} else {
filterInvPreProductRequest.setSupId(getCustomerId());
}
List<InvPreProductResponse> list = invPreProductService.filterList(filterInvPreProductRequest);
PageInfo<InvPreProductResponse> pageInfo = new PageInfo<>(list);
InvPreProductPageResponse<InvPreProductResponse> pageResponse = new InvPreProductPageResponse<>();

@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
import com.glxp.api.entity.inv.InvPreProductDetailEntity;
import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
@ -35,7 +36,7 @@ import java.util.List;
*/
@Slf4j
@RestController
public class InvPreinProductController {
public class InvPreinProductController extends BaseController {
@Resource
private InvPreinProductDetailService invPreinProductDetailService;
@Resource
@ -64,6 +65,13 @@ public class InvPreinProductController {
filterInvPreinProductRequest.setInvCodes(invCodes);
}
}
if (isHosUser()) {
} else {
filterInvPreinProductRequest.setSupId(getCustomerId());
}
List<InvPreinProductResponse> list = invPreinProductService.filterList(filterInvPreinProductRequest);
PageInfo<InvPreinProductResponse> pageInfo = new PageInfo<>(list);
InvPreProductPageResponse<InvPreinProductResponse> pageResponse = new InvPreProductPageResponse<>();

@ -304,6 +304,7 @@ public class SpsSyncDownloadController {
spsSyncOtherDataResponse.setTaskId(one.getId());
spsSyncOtherDataResponse.setIoCodeLostList((List<IoCodeLostEntity>) map.get(IoCodeLostEntity.class.getSimpleName()));
spsSyncOtherDataResponse.setIoCodeRelList((List<IoCodeRelEntity>) map.get(IoCodeRelEntity.class.getSimpleName()));
} catch (FileNotFoundException e) {
throw new RuntimeException("系统异常,未找到对应数据文件");
} catch (IOException e) {

@ -83,7 +83,7 @@ public class InvWarehouseEntity {
private String parentCode;
/**
*
* 1:23
*/
@TableField(value = "advanceType")
private Integer advanceType;

@ -14,7 +14,7 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
private String code;
private String name;
private String deptCode;
private Boolean advanceType;
private Integer advanceType;
private Boolean isDefault;
private Date updateTime;
private Integer level;

@ -154,6 +154,9 @@ public class FilterOrderRequest extends ListPageRequest {
private Integer orderType;
private Integer syncStatus;
//单据来源: 1:手工单2自动单
private Integer sourceLocalType;
/**
*
*/
@ -169,6 +172,8 @@ public class FilterOrderRequest extends ListPageRequest {
*/
private List<Integer> dealStatuses;
private List<Integer> sourceTypes;
private List<String> orderIds;

@ -11,7 +11,7 @@ import java.util.List;
public interface DeptService {
List<String> selectByIdCode(List<String> list);
DeptEntity findDefault(Boolean advaceType, Boolean isDefault);
DeptEntity findDefault(Integer advaceType, Boolean isDefault);
DeptEntity selectMaxCode(FilterInvWarehouseRequest filterInvWarehouseRequest);

@ -28,10 +28,9 @@ public class DeptServiceImpl implements DeptService {
}
@Override
public DeptEntity findDefault(Boolean advaceType, Boolean isDefault) {
public DeptEntity findDefault(Integer advaceType, Boolean isDefault) {
FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
filterInvWarehouseRequest.setIsDefault(isDefault);
filterInvWarehouseRequest.setAdvanceType(advaceType);
List<DeptEntity> invWarehouseEntities = deptDao.filterInvWarehouse(filterInvWarehouseRequest);
if (invWarehouseEntities != null && invWarehouseEntities.size() > 0)
return invWarehouseEntities.get(0);

@ -411,7 +411,7 @@ public class IoOrderServiceImpl implements IoOrderService {
}
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_REW);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
orderEntity.setUpdateTime(new Date());
update(orderEntity);
@ -580,7 +580,8 @@ public class IoOrderServiceImpl implements IoOrderService {
.gt("spUse", 1).eq("actionType", 1).eq("enable", true));
List<String> actions1 = null;
actions1 = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList());
filterOrderRequest.setInvoiceActions1(actions1);
if (CollUtil.isNotEmpty(actions1))
filterOrderRequest.setInvoiceActions1(actions1);
List<BasicBussinessTypeEntity> bussinessTypeEntities2 = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
.eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
@ -588,7 +589,8 @@ public class IoOrderServiceImpl implements IoOrderService {
.gt("spUse", 0).eq("actionType", 1).eq("enable", true));
List<String> actions2 = null;
actions2 = bussinessTypeEntities2.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList());
filterOrderRequest.setInvoiceActions2(actions2);
if (CollUtil.isNotEmpty(actions2))
filterOrderRequest.setInvoiceActions2(actions2);
}
@Override

@ -0,0 +1,49 @@
package com.glxp.api.task;
import com.glxp.api.constant.AsyncDiDlHelper;
import com.glxp.api.entity.basic.UdiCompanyEntity;
import com.glxp.api.service.basic.UdiCompanyService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
public class AsyncCompanyDlHelper {
@Resource
UdiCompanyService udiCompanyService;
@Resource
AsyncDiDlHelper asyncDiDlHelper;
@Value("${UDI_SERVER_URL}")
private String udiUrl;
private static final Logger logger = LoggerFactory.getLogger(AsyncCompanyDlHelper.class);
@Async
public void asyncDiByTime(String updateTime) {
int page = 1;
int limit = 300;
while (true) {
logger.info("更新时间:" + updateTime + "----" + page + "----" + limit);
List<UdiCompanyEntity> udiCompanyEntities = asyncDiDlHelper.dlCompanyByTime(udiUrl, page, limit, updateTime);
if (udiCompanyEntities != null && udiCompanyEntities.size() > 0) {
udiCompanyService.insertUdiCompanys(udiCompanyEntities);
if (udiCompanyEntities.size() < limit) {
break;
} else {
page++;
}
} else {
break;
}
}
logger.info("更新时间:" + updateTime + "----" + "下载结束");
}
}

@ -0,0 +1,60 @@
package com.glxp.api.task;
import com.glxp.api.dao.schedule.ScheduledDao;
import com.glxp.api.entity.system.ScheduledEntity;
import com.glxp.api.req.system.ScheduledRequest;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.RedisUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.SchedulingConfigurer;
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
import org.springframework.scheduling.support.CronTrigger;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Date;
@Component
@EnableScheduling
public class AsyncCompanyDlTask implements SchedulingConfigurer {
final Logger logger = LoggerFactory.getLogger(AsyncDiDlTask.class);
@Resource
AsyncCompanyDlHelper udiCompanyTask;
@Resource
RedisUtil redisUtil;
@Resource
private ScheduledDao scheduledDao;
@Override
public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
scheduledTaskRegistrar.addTriggerTask(() -> process(),
triggerContext -> {
ScheduledRequest scheduledRequest = new ScheduledRequest();
scheduledRequest.setCronName("syncCompany");
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
if (scheduledEntity == null) {
return null;
}
String cron = scheduledEntity.getCron();
if (cron.isEmpty()) {
logger.error("cron is null");
}
return new CronTrigger(cron).nextExecutionTime(triggerContext);
});
}
private void process() {
String lastUpDiTime = (String) redisUtil.get("lastUpCompanyTime");
if (lastUpDiTime == null) {
lastUpDiTime = DateUtil.getLastDayFormat(-10);
}
udiCompanyTask.asyncDiByTime(lastUpDiTime);
redisUtil.set("lastUpCompanyTime", DateUtil.formatDate(new Date()));
}
}

@ -0,0 +1,52 @@
package com.glxp.api.task;
import com.alibaba.fastjson.JSONArray;
import com.glxp.api.constant.AsyncDiDlHelper;
import com.glxp.api.entity.basic.ProductInfoEntity;
import com.glxp.api.service.basic.ProductInfoService;
import com.glxp.api.util.CustomUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
public class AsyncDiDlService {
@Value("${UDI_SERVER_URL}")
private String udiUrl;
@Resource
ProductInfoService productInfoService;
@Resource
AsyncDiDlHelper asyncDiDlHelper;
private static final Logger logger = LoggerFactory.getLogger(AsyncDiDlService.class);
@Async
public void asyncDiByTime(String updateTime) {
int page = 1;
int limit = 200;
while (true) {
logger.info("更新时间:" + updateTime + "----" + page + "----" + limit);
List<ProductInfoEntity> productInfoEntityList = asyncDiDlHelper.dlByTime(udiUrl, page, limit, updateTime);
if (productInfoEntityList != null && productInfoEntityList.size() > 0) {
productInfoService.insertProductInfos(productInfoEntityList);
if (productInfoEntityList.size() < limit) {
break;
} else {
page++;
}
} else {
break;
}
}
logger.info("更新时间:" + updateTime + "----" + "下载结束");
}
}

@ -0,0 +1,63 @@
package com.glxp.api.task;
import com.glxp.api.dao.schedule.ScheduledDao;
import com.glxp.api.entity.system.ScheduledEntity;
import com.glxp.api.req.system.ScheduledRequest;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.RedisUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.SchedulingConfigurer;
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
import org.springframework.scheduling.support.CronTrigger;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Date;
@Component
@EnableScheduling
public class AsyncDiDlTask implements SchedulingConfigurer {
final Logger logger = LoggerFactory.getLogger(AsyncDiDlTask.class);
@Resource
RedisUtil redisUtil;
@Resource
private ScheduledDao scheduledDao;
@Resource
AsyncDiDlService asyncDiDlService;
@Override
public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
scheduledTaskRegistrar.addTriggerTask(() -> process(),
triggerContext -> {
ScheduledRequest scheduledRequest = new ScheduledRequest();
scheduledRequest.setCronName("syncDi");
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
if (scheduledEntity == null) {
return null;
}
String cron = scheduledEntity.getCron();//"0 55 5 * * ?";
if (cron.isEmpty()) {
logger.error("cron is null");
}
return new CronTrigger(cron).nextExecutionTime(triggerContext);
});
}
private void process() {
String day = DateUtil.getLastDayFormat(-1);
asyncDiDlService.asyncDiByTime(day);
String lastUpDiTime = (String) redisUtil.get("lastDiUpTime");
if (lastUpDiTime == null) {
lastUpDiTime = DateUtil.getLastDayFormat(-10);
}
asyncDiDlService.asyncDiByTime(lastUpDiTime);
redisUtil.set("lastDiUpTime", DateUtil.formatDate(new Date()));
}
}

@ -54,8 +54,6 @@ public class AsyncHeartTask implements SchedulingConfigurer {
SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet();
if (syncDataSetEntity.isDownstreamEnable()) {
if (syncDataSetEntity.getSyncTime() != null) {
long timeInterval = syncDataSetEntity.getSyncTime() * 60 * 1000;
long curTime = System.currentTimeMillis();

@ -624,7 +624,7 @@ public class DateUtil extends DateUtils {
/**
*
*
* @param time
* @param date
* @param hour
* @return
*/
@ -639,4 +639,13 @@ public class DateUtil extends DateUtils {
}
return null;
}
}
public static String getLastDayFormat(int amount) {
SimpleDateFormat smdate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar calendar = new GregorianCalendar();
calendar.setTime(new Date());
calendar.add(calendar.DATE, amount);
String formatDate = smdate.format(calendar.getTime());
return formatDate;
}
}

@ -21,7 +21,7 @@ public class UdiCalCountUtil {
public int getActCount(UdiRelevanceResponse udiRelevanceResponse) {
int actCount;
if (!udiRelevanceResponse.getUseDy() && udiRelevanceResponse.getDiType() != 2) {
if (!udiRelevanceResponse.getUseDy() && (udiRelevanceResponse.getDiType() == null || udiRelevanceResponse.getDiType() != 2)) {
if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
actCount = udiRelevanceResponse.getZxxsbzbhsydysl();
} else {

@ -65,6 +65,14 @@
#{item}
</foreach>
</if>
<if test="sourceTypes != null and sourceTypes.size() != 0">
AND fromType in
<foreach collection="sourceTypes" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="statuses != null and statuses.size() != 0">
AND status in
<foreach collection="statuses" index="index" item="item" open="(" close=")" separator=",">
@ -91,23 +99,60 @@
</if>
<if test="supInoivceSearch != null">
<if test="invoiceActions1 != null and invoiceActions1.size() != 0">
AND (`action` in
<if test="invoiceActions1 != null and invoiceActions2 == null">
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">
<if test="invoiceActions1 == null and invoiceActions2 != null">
or (
`action` in
<foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
and status = 7
))
</if>
<if test="invoiceActions1 != null and invoiceActions2 != 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>
</if>
<if test="supInoivceSearch != null and invoiceActions1 == null and invoiceActions1.size() == 0">
<if test="invoiceActions2 != null and invoiceActions2.size() != 0">
and (
`action` in
<foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
and status = 7
)
</if>
</if>
<if test="supInoivceSearch != null and invoiceActions2 == null and invoiceActions2.size() == 0">
<if test="invoiceActions1 != null and invoiceActions2 == null">
AND (`action` in
<foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
and status = 10)
</if>
</if>
</where>
order by createTime desc
</select>

@ -195,6 +195,13 @@ CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'd
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'advancePreIn', 'tinyint', 1);
INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`)
VALUES (211, 'syncDi', '0 24 3 * * ?', NULL, NULL);
INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`)
VALUES (212, 'syncCompany', '0 0 3 * * 1', NULL, NULL);
# CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3);
# CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1);

Loading…
Cancel
Save