Changes

jinlin

2023-11-10 3d4f1501785120195d4a5ab6f4c2e62a7e23573e

Changes

 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java

@@ -14,6 +14,7 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.project.service.ProjectService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -23,7 +24,9 @@
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


/**
@@ -38,6 +41,8 @@
public class ProjectController {
    @Autowired
    private ProjectService projectService;
    @Autowired
    private SysCodeRuleService sysCodeRuleService;

    @GetMapping("page")
    @ApiOperation("分页")
@@ -70,8 +75,10 @@
    public Result insert(@RequestBody Project project){
        //效验数据
        ValidatorUtils.validateEntity(project, AddGroup.class, DefaultGroup.class);
        Map<String,String> map = new HashMap<>();
        map.put("funCode","project");
        project.setCode(sysCodeRuleService.getNewCode(map));
        projectService.insert(project);

        return Result.ok();
    }


 modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java

@@ -28,6 +28,9 @@
    @ApiModelProperty(value = "机构ID")
    private Long agencyId;

    @ApiModelProperty(value = "委托单编号")
    private String code;

    @ApiModelProperty(value = "运行环境")
    private String optEnviron;

@@ -133,10 +136,6 @@
    @TableField(exist = false)
    @ApiModelProperty(value = "软件名称")
    private String softwareName;

    @TableField(exist = false)
    @ApiModelProperty(value = "项目编号")
    private String code;

    @TableField(exist = false)
    @ApiModelProperty(value = "项目标识")

 modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java

@@ -3,10 +3,14 @@
import com.zt.common.service.BaseService;
import com.zt.life.modules.project.dao.ProjectDao;
import com.zt.life.modules.project.model.Project;
import com.zt.modules.coderule.service.SysCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


/**
@@ -17,7 +21,6 @@
 */
@Service
public class ProjectService  extends BaseService<ProjectDao, Project> {

    /**
     * 分页查询
     *
@@ -37,4 +40,5 @@
        super.deleteLogic(ids);
    }


}

 modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java

@@ -7,12 +7,15 @@
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


/**
@@ -32,6 +35,8 @@
    private SoftwareTestOrderMeasuredService softwareTestOrderMeasuredService;
    @Autowired
    private TestAgencyInfoService testAgencyInfoService;
    @Autowired
    private SysCodeRuleService sysCodeRuleService;

    /**
     * 分页查询
@@ -59,6 +64,9 @@
        if (softwareTestOrderId != null)
            baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder());
        else {
            Map<String, String> map = new HashMap<>();
            map.put("funCode", "software_test_order");
            softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
            baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
            softwareTestOrderId = softwareTestOrderDto.getSoftwareTestOrder().getId();
        }

 zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java

@@ -45,7 +45,7 @@

    public String getNewCode(Map<String, String> map) {
        SysCodeRule codeRule = baseDao.getCodeRule(map);
        String newCodeTemplet = codeRule.getFunCode();
        String newCodeTemplet = codeRule.getCodeRule();
        if (map.get("projectId")!=null){
            String projectIdentity = baseDao.getProjectIdentity(map.get("projectId"));
            newCodeTemplet = newCodeTemplet.replace("[项目编号]",projectIdentity);