Changes

jinlin

2023-11-10 27410959f19cf24ca0613510da2274a38fc79e69

Changes

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

@@ -46,7 +46,12 @@
        @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
        @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
        @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
        @ApiImplicitParam(name = "softwareName", value = "软件名称", dataType = Constant.QT.STRING, format = "software_name^LK"),        @ApiImplicitParam(name = "secretClass", value = "密级", dataType = Constant.QT.STRING, format = "secret_class^EQ"),        @ApiImplicitParam(name = "criticalLevel", value = "关键等级", dataType = Constant.QT.STRING, format = "critical_level^EQ"),        @ApiImplicitParam(name = "testLevel", value = "测试级别", dataType = Constant.QT.STRING, format = "test_level^EQ"),        @ApiImplicitParam(name = "softwareType", value = "软件类型", dataType = Constant.QT.STRING, format = "software_type^EQ"),        @ApiImplicitParam(name = "isContract", value = "是否签署合同", dataType = Constant.QT.STRING, format = "is_contract^EQ")    })
        @ApiImplicitParam(name = "softwareName", value = "软件名称", dataType = Constant.QT.STRING, format = "software_name^LK"),
        @ApiImplicitParam(name = "secretClass", value = "密级", dataType = Constant.QT.STRING, format = "secret_class^EQ"),
        @ApiImplicitParam(name = "criticalLevel", value = "关键等级", dataType = Constant.QT.STRING, format = "critical_level^EQ"),
        @ApiImplicitParam(name = "testLevel", value = "测试级别", dataType = Constant.QT.STRING, format = "test_level^EQ"),
        @ApiImplicitParam(name = "softwareType", value = "软件类型", dataType = Constant.QT.STRING, format = "software_type^EQ"),
        @ApiImplicitParam(name = "isContract", value = "是否签署合同", dataType = Constant.QT.STRING, format = "is_contract^EQ")    })
    public PageResult<Project> page(@ApiIgnore @QueryParam QueryFilter queryFilter){

        return PageResult.ok(projectService.page(queryFilter));
@@ -56,7 +61,6 @@
    @ApiOperation("信息")
    public Result<Project> get(@PathVariable("id") Long id){
        Project data = projectService.get(id);

        return Result.ok(data);
    }


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

@@ -12,8 +12,14 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.project.dto.ProjectDto;
import com.zt.life.modules.project.model.SoftwareTestOrder;
import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.project.service.SoftwareTestOrderDeliverableService;
import com.zt.life.modules.project.service.SoftwareTestOrderMeasuredService;
import com.zt.life.modules.project.service.SoftwareTestOrderService;
import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -37,7 +43,15 @@
@Api(tags="software_test_order")
public class SoftwareTestOrderController {
    @Autowired
    private ProjectService projectService;
    @Autowired
    private SoftwareTestOrderService softwareTestOrderService;
    @Autowired
    private SoftwareTestOrderDeliverableService softwareTestOrderDeliverableService;
    @Autowired
    private SoftwareTestOrderMeasuredService softwareTestOrderMeasuredService;
    @Autowired
    private TestAgencyInfoService testAgencyInfoService;

    @GetMapping("page")
    @ApiOperation("分页")
@@ -56,12 +70,18 @@

    @GetMapping("{id}")
    @ApiOperation("信息")
    public Result<SoftwareTestOrder> get(@PathVariable("id") Long id){
        SoftwareTestOrder data = softwareTestOrderService.get(id);

    public Result<ProjectDto> get(@PathVariable("id") Long id){
        ProjectDto data = new ProjectDto();
        SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(id);
        data.setSoftwareTestOrder(softwareTestOrder);
        data.setProject(projectService.get(softwareTestOrder.getProjectId()));
        data.setTestAgencyInfo(testAgencyInfoService.get(softwareTestOrder.getAgencyId()));
        data.setChildrenTable2(softwareTestOrderDeliverableService.childrenTables(softwareTestOrder.getId()));
        data.setChildrenTable1(softwareTestOrderMeasuredService.childrenTables(softwareTestOrder.getId()));
        return Result.ok(data);
    }


    @PostMapping
    @ApiOperation("新增")
    @LogOperation("新增")

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

@@ -30,7 +30,7 @@
 * software_test_order_deliverable
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-08
 * @since 1.0.0 2023-11-09
 */
@RestController
@RequestMapping("/project/SoftwareTestOrderDeliverable/")

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

@@ -30,7 +30,7 @@
 * software_test_order_measured
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-08
 * @since 1.0.0 2023-11-09
 */
@RestController
@RequestMapping("/project/SoftwareTestOrderMeasured/")

 modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java

@@ -13,11 +13,12 @@
 * software_test_order_deliverable
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-08
 * @since 1.0.0 2023-11-09
 */
@Mapper
public interface SoftwareTestOrderDeliverableDao extends BaseDao<SoftwareTestOrderDeliverable> {

    List<SoftwareTestOrderDeliverable> getList(Map<String, Object> params);
    List<SoftwareTestOrderDeliverable> childrenTables(Long id);

}

 modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java

@@ -1,6 +1,7 @@
package com.zt.life.modules.project.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import org.apache.ibatis.annotations.Mapper;

@@ -13,11 +14,11 @@
 * software_test_order_measured
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-08
 * @since 1.0.0 2023-11-09
 */
@Mapper
public interface SoftwareTestOrderMeasuredDao extends BaseDao<SoftwareTestOrderMeasured> {

    List<SoftwareTestOrderMeasured> getList(Map<String, Object> params);

    List<SoftwareTestOrderMeasured> childrenTables(Long id);
}

 modules/mainPart/src/main/java/com/zt/life/modules/project/dto/ProjectDto.java

@@ -13,7 +13,7 @@
import java.util.List;

@Data
public class ProjectDto extends Project {
public class ProjectDto extends SoftwareTestOrder {

    private SoftwareTestOrder softwareTestOrder;
    private Project project;
@@ -22,6 +22,5 @@
    private List<SoftwareTestOrderMeasured> childrenTable1 = new ArrayList<>();
    @ApiModelProperty(value = "交付件")
    private List<SoftwareTestOrderDeliverable> childrenTable2 = new ArrayList<>();

}


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

@@ -25,6 +25,9 @@
    @ApiModelProperty(value = "项目ID")
    private Long projectId;

    @ApiModelProperty(value = "机构ID")
    private Long agencyId;

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

@@ -171,6 +174,28 @@
    @ApiModelProperty(value = "是否签署合同")
    private Integer isContract;


    @TableField(exist = false)
    @ApiModelProperty(value = "序号")
    private Integer num;

    @TableField(exist = false)
    @ApiModelProperty(value = "委托单ID")
    private Long orderId;

    @TableField(exist = false)
    @ApiModelProperty(value = "名称")
    private String name;

    @TableField(exist = false)
    @ApiModelProperty(value = "标识/版本")
    private String identify;

    @TableField(exist = false)
    @ApiModelProperty(value = "是否被测件")
    private String isMeasured;


    public String getEntrustUnitName() {
        return entrustUnitName;
    }

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

@@ -13,7 +13,7 @@
 * software_test_order_deliverable
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-08
 * @since 1.0.0 2023-11-09
 */
@Data
@EqualsAndHashCode(callSuper=false)
@@ -22,7 +22,10 @@
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "序号")
    private Integer code;
    private Integer num;

    @ApiModelProperty(value = "委托单ID")
    private Long orderId;

    @ApiModelProperty(value = "名称")
    private String name;

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

@@ -13,7 +13,7 @@
 * software_test_order_measured
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-08
 * @since 1.0.0 2023-11-09
 */
@Data
@EqualsAndHashCode(callSuper=false)
@@ -21,8 +21,12 @@
public class SoftwareTestOrderMeasured extends BusiEntity {
    private static final long serialVersionUID = 1L;


    @ApiModelProperty(value = "序号")
    private Integer code;
    private Integer num;

    @ApiModelProperty(value = "委托单ID")
    private Long orderId;

    @ApiModelProperty(value = "名称")
    private String name;

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

@@ -13,7 +13,7 @@
 * software_test_order_deliverable
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-08
 * @since 1.0.0 2023-11-09
 */
@Service
public class SoftwareTestOrderDeliverableService  extends BaseService<SoftwareTestOrderDeliverableDao, SoftwareTestOrderDeliverable> {
@@ -29,6 +29,14 @@
    }

    /**
     * 子表查询
     *
     */
    public List<SoftwareTestOrderDeliverable> childrenTables(Long orderId) {
        return baseDao.childrenTables(orderId);
    }

    /**
     * 删除
     *
     * @param ids

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

@@ -2,6 +2,7 @@

import com.zt.common.service.BaseService;
import com.zt.life.modules.project.dao.SoftwareTestOrderMeasuredDao;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
@@ -13,7 +14,7 @@
 * software_test_order_measured
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-08
 * @since 1.0.0 2023-11-09
 */
@Service
public class SoftwareTestOrderMeasuredService  extends BaseService<SoftwareTestOrderMeasuredDao, SoftwareTestOrderMeasured> {
@@ -29,6 +30,14 @@
    }

    /**
     * 子表查询
     *
     */
    public List<SoftwareTestOrderMeasured> childrenTables(Long orderId) {
        return baseDao.childrenTables(orderId);
    }

    /**
     * 删除
     *
     * @param ids

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

@@ -28,6 +28,7 @@
        return baseDao.getList(queryFilter.getQueryParams());
    }


    /**
     * 删除
     *

 modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml

@@ -16,5 +16,14 @@
            ORDER BY ${orderBySql}
        </if>
    </select>
    <select id="childrenTables" resultType="com.zt.life.modules.project.model.SoftwareTestOrderDeliverable">

        SELECT a.*
        FROM software_test_order_deliverable a
        INNER JOIN software_test_order p ON p.id = a.order_id
        <where>
            a.is_delete = 0
            and p.is_delete = 0
        </where>
    </select>
</mapper>

 modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml

@@ -17,4 +17,18 @@
        </if>
    </select>

    <select id="childrenTables" resultType="com.zt.life.modules.project.model.SoftwareTestOrderMeasured">

        SELECT a.*
        FROM software_test_order_measured a
        INNER JOIN software_test_order p ON p.id = a.order_id
        <where>
            a.is_delete = 0
            <if test="whereSql!=null">
                and ${whereSql}
            </if>
        </where>

    </select>

</mapper>

 web/src/views/modules/project/Project-AddOrUpdate.vue

@@ -60,8 +60,8 @@
          </div>
          <div class="DSTOld-1-Form">
            <!-- 单位名称 -->
            <zt-form-item label="软件名称" prop="software" style="width: 49%" rules="required">
              <el-input v-model="dataForm.software" placeholder="请输入软件名称"></el-input>
            <zt-form-item label="软件名称" prop="softwareName" style="width: 49%" rules="required">
              <el-input v-model="dataForm.softwareName" placeholder="请输入软件名称"></el-input>
            </zt-form-item>
            <!-- 联系人 -->
            <zt-form-item label="软件标识" prop="identity" style="width: 49%" rules="required">
@@ -83,11 +83,7 @@
                软件类型
              </div>
              <div style="width: calc(100% - 120px);">
                <el-checkbox-group v-model="dataForm.checkList">
                  <el-checkbox :label="0">通用应用软件</el-checkbox>
                  <el-checkbox :label="1">行业应用软件</el-checkbox>
                  <el-checkbox :label="2">嵌入式软件</el-checkbox>
                </el-checkbox-group>
                <zt-dict v-model="dataForm.softwareType" :radio="true"  dict="software_type" clearable></zt-dict>
              </div>
            </div>
          </div>
@@ -187,8 +183,8 @@
          developUnitAddress: '',
          developUnitContact: '',
          developUnitContWay: '',
          checkList:[0,1],
          software: '',
          softwareType: '',
          softwareName: '',
          code: '',
          identity: '',
          secretClass: '',
@@ -197,7 +193,7 @@
          projectLeader: '',
          projectTesters: '',
          projectReviewer: '',
          isContract: ''
          isContract: '',
        }
      }
    },
@@ -205,10 +201,13 @@
      // 获取信息
      async getInfo() {
        let res = await this.$http.get(`/project/Project//${this.dataForm.id}`)
        if (res.success) {
        this.dataForm = {
          ...this.dataForm,
          ...res.data
        }
        }

      },
      // 表单提交
      async formSubmit() {