jinlin
2024-01-15 1a7af6fff5185bb257c16b0445140c93263a3331
修改
6个文件已修改
36 ■■■■■ 已修改文件
modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/service/QaAuditReportService.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderTechnicalDao.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
starter/src/main/resources/application.yml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/packages/views/modules/sys/role-user.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/project/Project-AddOrUpdate.vue 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/service/QaAuditReportService.java
@@ -24,6 +24,7 @@
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.oss.service.SysOssService;
import com.zt.modules.sys.service.SysUserService;
import com.zt.modules.workflow.dto.FlowInfoDto;
import com.zt.modules.workflow.service.WorkflowService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -73,6 +74,9 @@
    @Autowired
    private WorkflowService workflowService;
    @Autowired
    private SysUserService sysUserService;
    /**
     * 分页查询
     *
@@ -177,6 +181,12 @@
        try {
            QaAuditReportDto dataObj = this.getDto(null, id);
            String projectLeaderId=dataObj.getProject().getProjectLeader();
            String projectConfigerId=dataObj.getProject().getProjectTesters();
            String projectTestersId=dataObj.getProject().getProjectConfiger();
            dataObj.getProject().setProjectLeader(sysUserService.getNames(projectLeaderId));
            dataObj.getProject().setProjectTesters(sysUserService.getNames(projectTestersId));
            dataObj.getProject().setProjectConfiger(sysUserService.getNames(projectConfigerId));
            String CheckerPath = "文件图片:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getAuditReport().getCheckerId()));
            dataObj.getAuditReport().setChecker(CheckerPath);
            String SupervisorPath = "文件图片:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getAuditReport().getSupervisorId()));
modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderTechnicalDao.xml
@@ -20,7 +20,6 @@
        SELECT m.*, p.secret_class
        FROM software_test_order_measured m
        JOIN software_test_order s ON s.id = m.order_id
        JOIN software_test_order_deliverable d ON d.ord_id = m.order_id
        JOIN project p ON p.id = ${projectId}
        <where>
            s.is_delete = 0 and m.is_delete = 0
starter/src/main/resources/application.yml
@@ -4,7 +4,7 @@
    uri-encoding: UTF-8
    max-threads: 1000
    min-spare-threads: 30
  port: 8058
  port: 8050
  servlet:
    context-path: /life-protection
    session:
@@ -23,6 +23,7 @@
#      url: jdbc:mysql://127.0.0.1:3306/zhpt_djxl?serverTimezone=GMT&allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
      username: root
      password: root
      #password: 123456
#      driver-class-name: com.kingbase8.Driver
#      url: jdbc:kingbase8://192.168.0.25:54321/ZHPT?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
#      username: SYSTEM
@@ -113,13 +114,13 @@
  #    initFromJson: true
  server-url-prefix: http://localhost:8100/cas
  server-login-url: http://localhost:8100/cas/login
  client-host-url: http://localhost:8058
  client-host-url: http://localhost:8050
  validation-type: cas
zt:
  oss:
    type: local
    local-domain: http://127.0.0.1:8058/life-protection/
    local-domain: http://127.0.0.1:8050/life-protection/
    local-path: D:/TestProjectFiles/ #附件存储目录
    local-qd-path: D:/TestProjectFiles/ #附件存储目录
    local-prefix: accessories #附件存储子目录
web/packages/views/modules/sys/role-user.vue
@@ -58,6 +58,7 @@
          await this.$tip.success()
          this.$refs.examineObj.query()
          this.$refs.dialog.close()
          this.$emit('refreshDataList')
        }
      }
    },
web/src/views/modules/project/Project-AddOrUpdate.vue
@@ -103,32 +103,32 @@
          </div>
          <div class="DSTOld-1-Form">
            <zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="所属部门" prop="bizDeptId"
                          style="width: 48%">
                          style="width: 48%" rules="required">
              <zt-select @input="changeDept" v-model="dataForm.bizDeptId" :datas="bizDeptList" placeholder="所属部门"/>
            </zt-form-item>
            <!-- 是否签署合同 -->
            <zt-form-item label-width="120px" label="是否签署合同" prop="isContract" style="width: 48%">
            <zt-form-item label-width="120px" label="是否签署合同" prop="isContract" style="width: 48%" rules="required">
              <zt-dict v-model="dataForm.isContract" dict="is_or_not"></zt-dict>
            </zt-form-item>
            <!-- 项目负责人 -->
            <zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="项目负责人" prop="projectLeader"
                          style="width: 48%">
                          style="width: 48%" rules="required">
              <zt-select v-model="dataForm.projectLeader" :datas="projectLeaderList" placeholder="项目负责人"/>
            </zt-form-item>
            <!-- 项目测试人员 -->
            <zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="项目测试人员" prop="projectTesters"
                          style="width: 48%">
                          style="width: 48%" rules="required">
              <!--                <el-input v-model="dataForm.projectTesters" placeholder="请输入项目测试人员"></el-input>-->
              <zt-select v-model="dataForm.projectTesters" :datas="projectTestersList" :multiple="true"
                         :clearable="true" placeholder="项目测试人员"/>
            </zt-form-item>
            <!-- 项目审核人 -->
            <zt-form-item label-width="120px" label="项目审核人" prop="projectReviewer" style="width: 48%">
            <zt-form-item label-width="120px" label="项目审核人" prop="projectReviewer" style="width: 48%" rules="required">
              <!--                <el-input v-model="dataForm.projectReviewer" placeholder="请输入项目审核人"></el-input>-->
              <zt-select v-model="dataForm.projectReviewer" :datas="projectReviewerList" :multiple="true"
                         :clearable="true" placeholder="项目审核人"/>
            </zt-form-item>
            <zt-form-item label-width="120px" label="项目配置人" prop="projectConfiger" style="width: 48%">
            <zt-form-item label-width="120px" label="项目配置人" prop="projectConfiger" style="width: 48%" rules="required">
              <!--                <el-input v-model="dataForm.projectReviewer" placeholder="请输入项目审核人"></el-input>-->
              <zt-select v-model="dataForm.projectConfiger" :datas="projectConfigerList" :multiple="true"
                         :clearable="true" placeholder="项目配置人"/>
@@ -176,11 +176,6 @@
        bizDeptIdList: [],
      }
    },
    // watch: {
    //   "dataForm.bizDeptId"(){
    //     this.getUserList()
    //   }
    // },
    methods: {
      init() {
        this.getInfo()
zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java