Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

lxw

2023-09-22 001a49a10d39dd6b0d3f6b7e1ad8e691c9664f01

Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

 src/main/java/com/whyc/pojo/MailUser.java

@@ -8,7 +8,7 @@
    private Integer id;
    private String user;

    //1-软件发布,2-sop
    //邮件名单:1-软件发布,2-sop,3-产品首次解锁后
    private Integer type;

    public Integer getId() {

 src/main/java/com/whyc/service/ProductHistoryService.java

@@ -13,6 +13,7 @@
import com.whyc.pojo.ProductHistory;
import com.whyc.pojo.ProductLockLog;
import com.whyc.util.ActionUtil;
import com.whyc.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -48,7 +49,26 @@
    }

    /**新增追加的版本并将原先的版本的启用设置为未启用*/
    @Transactional
    public void insertAndUpdateEnabled(ProductHistory productHistory) {
        QueryWrapper<ProductHistory> query = Wrappers.query();
        query.eq("parent_code",productHistory.getParentCode())
                .eq("custom_code",productHistory.getCustomCode()).eq("enabled",1);
        ProductHistory productEnabled = mapper.selectOne(query);
        //添加新增日志到tb_product_lock_log表
        ProductLockLog lockLog = new ProductLockLog();
        lockLog.setParentCode(productEnabled.getParentCode());
        lockLog.setCustomCode(productEnabled.getCustomCode());
        lockLog.setVersion(productEnabled.getVersion());
        lockLog.setVersionTime(DateUtil.YYYY_MM_DD_HH_MM_SS.format(productEnabled.getVersionTime()));
        lockLog.setReason("产品bom上传,原生效版本锁定");
        lockLog.setOwner(ActionUtil.getUser().getName());
        lockLog.setCreateTime(new Date());
        //1代表日志类型为:锁定
        lockLog.setLockFlag(1);

        lockLogService.insert(lockLog);

        UpdateWrapper<ProductHistory> update = Wrappers.update();
        update.set("enabled",0).eq("parent_code",productHistory.getParentCode())
                .eq("custom_code",productHistory.getCustomCode()).eq("enabled",1);