借款签名

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBorrowController.java

@@ -98,15 +98,15 @@ public class CmcBorrowController extends BaseController
             cmcBorrow.setManagerUserId(getLoginUser().getUserId());
             cmcBorrow.setManagerTime(new Date());
         }
-        if (cmcBorrow.getZjlComment() != null && cmcBorrow.getDszComment() == null) {
+        if (cmcBorrow.getZjlComment() != null && cmcBorrow.getDszComment() == null && cmcBorrow.getLendTime() == null) {
             cmcBorrow.setZjlUserId(getLoginUser().getUserId());
             cmcBorrow.setZjlTime(new Date());
         }
-        if (cmcBorrow.getDszComment() != null && cmcBorrow.getCwComment() == null) {
+        if (cmcBorrow.getDszComment() != null && cmcBorrow.getLendTime() == null) {
             cmcBorrow.setDszUserId(getLoginUser().getUserId());
             cmcBorrow.setDszTime(new Date());
         }
-        if (cmcBorrow.getUnionComment() != null && cmcBorrow.getCwComment() == null) {
+        if (cmcBorrow.getUnionComment() != null && cmcBorrow.getLendTime() == null) {
             cmcBorrow.setUnionUserId(getLoginUser().getUserId());
             cmcBorrow.setUnionTime(new Date());
         }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarApprovalController.java

@@ -180,8 +180,14 @@ public class CmcCarApprovalController extends BaseController
                 CmcProject cmcProject = new CmcProject();
                 cmcProject.setProjectId(formDataJson.getString("projectId"));
                 CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());
-                project.setDrivers(project.getDrivers() + "," + cmcCarApproval.getDrivers());
-                project.setCars(project.getCars() + "," + carString);
+                if (project.getDrivers() != null && !project.getDrivers().equals(cmcCarApproval.getDrivers()))
+                    project.setDrivers(project.getDrivers() + "," + cmcCarApproval.getDrivers());
+                if (project.getDrivers() == null)
+                    project.setDrivers(cmcCarApproval.getDrivers());
+                if (project.getCars() != null && !project.getCars().equals(carString))
+                    project.setCars(project.getCars() + "," + carString);
+                if (project.getCars() == null)
+                    project.setCars(carString);
                 cmcProjectService.updateCmcProject(project);
             }
             String[] cars = carString.split(",");

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java

@@ -147,7 +147,10 @@ public class CmcDeviceApprovalController extends BaseController
                 CmcProject cmcProject = new CmcProject();
                 cmcProject.setProjectId(formDataJson.getString("projectId"));
                 CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());
-                project.setDevices(project.getDevices() + "," + cmcDeviceApproval.getModifyDevices());
+                if (project.getDevices() != null && !project.getDevices().equals(cmcDeviceApproval.getModifyDevices()))
+                    project.setDevices(project.getDevices() + "," + cmcDeviceApproval.getModifyDevices());
+                if (project.getDevices() == null)
+                    project.setDevices(cmcDeviceApproval.getModifyDevices());
                 cmcProjectService.updateCmcProject(project);
             }
             String[] devices = deviceString.split(",");

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java

@@ -161,6 +161,8 @@ public class CmcProject extends BaseEntity
 
     private SysUser technicalDirectorUser;
 
+    private SysUser technicalDesignerUser;
+
     private SysUser projectRegistrantUser;
 
     public void setProjectId(String projectId)
@@ -415,6 +417,15 @@ public class CmcProject extends BaseEntity
     {
         return qualityInspector;
     }
+//    public void setTechnicalDesignerUser(SysUser technicalDesignerUser)
+//    {
+//        this.technicalDesignerUser = technicalDesignerUser;
+//    }
+
+    public SysUser getTechnicalDesignerUser()
+    {
+        return technicalDesignerUser;
+    }
     public void setQualityInspectorName(String qualityInspectorName)
     {
         this.qualityInspectorName = qualityInspectorName;

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -41,6 +41,7 @@
         <association property="projectLeaderUser"    javaType="SysUser"         resultMap="ProjectLeaderResult" />
         <association property="projectRegistrantUser"    javaType="SysUser"         resultMap="ProjectRegistrantResult" />
         <association property="technicalDirectorUser"    javaType="SysUser"         resultMap="TechnicalDirectorResult" />
+        <association property="technicalDesignerUser"    javaType="SysUser"         resultMap="TechnicalDesignerResult" />
         <association property="partyA"    javaType="CmcPartyA"         resultMap="CmcPartyAResult" />
     </resultMap>
 
@@ -59,6 +60,11 @@
         <result property="nickName"    column="director_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="TechnicalDesignerResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="design_nick_name"    />
+    </resultMap>
+
     <resultMap type="CmcPartyA" id="CmcPartyAResult">
         <result property="partyAId"    column="party_a_id"    />
         <result property="partyAName"    column="party_a_name"    />
@@ -68,11 +74,12 @@
         select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a_id, pa.party_a_name, p.contact_person, p.telephone,
                p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.organize_document, p.organize_time,
                p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, tp.technical_director, u2.nick_name as director_nick_name, tp.quality_inspector, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat,
-               p.cars, p.drivers, p.devices, p.participates, p.task_document, p.project_request from cmc_project as p
+               p.cars, p.drivers, p.devices, p.participates, p.task_document, p.project_request, tp.technical_designer, u3.nick_name as design_nick_name from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
         left join cmc_technical_plan as tp on tp.project_id = p.project_id
         left join sys_user as u2 on u2.user_id = tp.technical_director
+        left join sys_user as u3 on u3.user_id = tp.technical_designer
         left join cmc_party_a as pa on pa.party_a_id = p.party_a_id
     </sql>
 

oa-ui/src/views/oa/device/detail.vue

@@ -194,9 +194,9 @@
                 {{ scope.row.project ? scope.row.project.projectName : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="申请时间" align="center" prop="beginDate">
+            <el-table-column label="申请时间" align="center" prop="applyDate">
               <template slot-scope="scope">
-                {{ scope.row.beginDate }}
+                {{ scope.row.applyDate }}
               </template>
             </el-table-column>
             <el-table-column label="归还时间" align="center" prop="returnDate">
@@ -849,20 +849,29 @@ export default {
       }
     },
     stateTypeText(row) {
-      if (row.repairDevices.indexOf(this.$route.query.deviceId) == -1) {
-        return '完好'
-      }
-      else {
-        return '需维修'
+      if (row.repairDevices) {
+        if (row.repairDevices.indexOf(this.$route.query.deviceId) == -1) {
+          return '完好'
+        }
+        else {
+          return '需维修'
+        }
       }
+      else 
+      return '完好'
     },
     stateTypeStyle(row) {
-      if (row.repairDevices.indexOf(this.$route.query.deviceId) == -1) {
-        return 'success'
-      }
-      else {
-        return 'danger'
+
+      if (row.repairDevices) {
+        if (row.repairDevices.indexOf(this.$route.query.deviceId) == -1) {
+          return 'success'
+        }
+        else {
+          return 'danger'
+        }
       }
+      else 
+        return 'success'
     },
     statusTypeText(row) {
       if (row == '0') {

oa-ui/src/views/oa/device/index.vue

@@ -59,7 +59,7 @@
 
     <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="设备id" align="center" prop="deviceId" /> -->
+      <el-table-column label="设备编号" align="center" prop="deviceNumber" />
       <el-table-column label="设备状态" align="center" prop="status">
         <template slot-scope="scope">
           <el-tag :type="statusTypeStyle(scope.row.status)">{{ statusTypeText(scope.row.status) }}</el-tag>

oa-ui/src/views/oa/project/info.vue

@@ -234,7 +234,7 @@
                 <svg-icon slot="prefix" icon-class="user" />
                 技术设计人
               </template>
-              {{ getUserName(project.projectLeader) }}
+              {{ project.technicalDesignerUser ? project.technicalDesignerUser.nickName : '' }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">