新增办公设备使用人字段；可置空kml；

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

@@ -152,15 +152,23 @@ public class FilesProjectController extends BaseController {
                 File profilePath = new File(profile);
                 if (!profilePath.exists())//若此目录不存在，则创建之
                     profilePath.mkdirs();
-                File transferFile = new File( profilePath + "\\" + uploadProjectKmlFile.getOriginalFilename());
+                File transferFile = new File( profilePath + "/upload/uploadKmlFiles/" + uploadProjectKmlFile.getOriginalFilename());
                 if (!transferFile.exists())
                     uploadProjectKmlFile.transferTo(transferFile);
                 cmcProject.setProjectKml(transferFile.getName());
+                return false;
             }
             else
+            {
+                cmcProject.setProjectKml(null);
                 return true;
+            }
+        }
+        else
+        {
+            cmcProject.setProjectKml(null);
+            return true;
         }
-        return false;
     }
 
     private boolean uploadCpKmlFile(CmcProject cmcProject, MultipartFile uploadCpKmlFile) throws IOException {
@@ -169,15 +177,23 @@ public class FilesProjectController extends BaseController {
                 File profilePath = new File(profile);
                 if (!profilePath.exists())//若此目录不存在，则创建之
                     profilePath.mkdirs();
-                File transferFile = new File( profilePath + "\\" + uploadCpKmlFile.getOriginalFilename());
+                File transferFile = new File( profilePath + "/upload/uploadKmlFiles/" + uploadCpKmlFile.getOriginalFilename());
                 if (!transferFile.exists())
                     uploadCpKmlFile.transferTo(transferFile);
                 cmcProject.setProjectCp(transferFile.getName());
+                return false;
             }
             else
+            {
+                cmcProject.setProjectCp(null);
                 return true;
+            }
+        }
+        else
+        {
+            cmcProject.setProjectCp(null);
+            return true;
         }
-        return false;
     }
 
     /**
@@ -186,11 +202,12 @@ public class FilesProjectController extends BaseController {
     @Log(title = "项目管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public AjaxResult edit(CmcProject cmcProject, @RequestParam(value = "kmlfile",required = false) MultipartFile uploadProjectKmlFile, @RequestParam(value = "cpfile",required = false) MultipartFile uploadCpKmlFile) throws IOException {
+        String msg = "";
         if (uploadProjectKmlFile(cmcProject, uploadProjectKmlFile) )
-            return AjaxResult.error("项目范围kml文件内容为空");
+            msg = "项目范围kml文件内容为空";
         if (uploadCpKmlFile(cmcProject, uploadCpKmlFile))
-            return AjaxResult.error("项目控制点kml文件内容为空");
-        return toAjax(cmcProjectService.updateCmcProject(cmcProject));
+            msg = "项目控制点kml文件内容为空";
+        return AjaxResult.success(msg, cmcProjectService.updateCmcProject(cmcProject));
     }
 
     /**

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

@@ -87,7 +87,7 @@ public class CmcBudgetController extends BaseController
             cmcBudget.setAuditor(getLoginUser().getUserId());
             cmcBudget.setZjlTime(new Date());
         }
-        if (cmcBudget.getDszComment() != null) {
+        if (cmcBudget.getDszComment() != null && cmcBudget.getDszTime() == null) {
             cmcBudget.setApprover(getLoginUser().getUserId());
             cmcBudget.setDszTime(new Date());
         }

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

@@ -30,6 +30,10 @@ public class CmcDevice extends BaseEntity
     @Excel(name = "设备编码")
     private String deviceNumber;
 
+    /** 使用人 */
+    @Excel(name = "使用人")
+    private String deviceUser;
+
     /** 设备类别 */
     @Excel(name = "设备类别")
     private String type;
@@ -99,6 +103,15 @@ public class CmcDevice extends BaseEntity
     {
         return deviceNumber;
     }
+    public void setDeviceUser(String deviceUser)
+    {
+        this.deviceUser = deviceUser;
+    }
+
+    public String getDeviceUser()
+    {
+        return deviceUser;
+    }
     public void setCode(String code)
     {
         this.code = code;
@@ -233,6 +246,7 @@ public class CmcDevice extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                 .append("deviceId", getDeviceId())
                 .append("deviceNumber", getDeviceNumber())
+                .append("deviceUser", getDeviceUser())
                 .append("code", getCode())
                 .append("name", getName())
                 .append("type", getType())

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

@@ -7,6 +7,7 @@
     <resultMap type="CmcDevice" id="CmcDeviceResult">
         <result property="deviceId"    column="device_id"    />
         <result property="deviceNumber"    column="device_number"    />
+        <result property="deviceUser"    column="device_user"    />
         <result property="code"    column="code"    />
         <result property="name"    column="name"    />
         <result property="type"    column="type"    />
@@ -30,7 +31,7 @@
     </resultMap>
 
     <sql id="selectCmcDeviceVo">
-        select d.device_id, d.device_number, d.code, d.name, d.type, d.acquisition_time, d.cost, d.expect_life, d.series, d.brand, d.day_cost, d.place, d.remark, d.manage_dept, d.status, dept.dept_name, de.document from cmc_device as d
+        select d.device_id, d.device_number, d.device_user, d.code, d.name, d.type, d.acquisition_time, d.cost, d.expect_life, d.series, d.brand, d.day_cost, d.place, d.remark, d.manage_dept, d.status, dept.dept_name, de.document from cmc_device as d
         left join sys_dept as dept on dept.dept_id = d.manage_dept
         left join (select * from cmc_device_expense as cde where cde.expense_type = '3') as de on de.device_id = d.device_id
     </sql>
@@ -39,6 +40,7 @@
         <include refid="selectCmcDeviceVo"/>
         <where>
             <if test="deviceNumber != null  and deviceNumber != ''"> and d.device_number like concat('%', #{deviceNumber}, '%')</if>
+            <if test="deviceUser != null  and deviceUser != ''"> and d.device_user like concat('%', #{deviceUser}, '%')</if>
             <if test="code != null  and code != ''"> and d.code like concat('%', #{code}, '%')</if>
             <if test="name != null  and name != ''"> and d.name like concat('%', #{name}, '%')</if>
             <if test="type != null  and type != ''"> and d.type like concat('%', #{type}, '%')</if>
@@ -67,6 +69,7 @@
         insert into cmc_device
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deviceNumber != null">device_number,</if>
+            <if test="deviceUser != null">device_user,</if>
             <if test="code != null">code,</if>
             <if test="name != null">name,</if>
             <if test="type != null">type,</if>
@@ -83,6 +86,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceNumber != null">#{deviceNumber},</if>
+            <if test="deviceUser != null">#{deviceUser},</if>
             <if test="code != null">#{code},</if>
             <if test="name != null">#{name},</if>
             <if test="type != null">#{type},</if>
@@ -103,6 +107,7 @@
         update cmc_device
         <trim prefix="SET" suffixOverrides=",">
             <if test="deviceNumber != null">device_number = #{deviceNumber},</if>
+            <if test="deviceUser != null">device_user = #{deviceUser},</if>
             <if test="code != null">code = #{code},</if>
             <if test="name != null">name = #{name},</if>
             <if test="type != null">type = #{type},</if>

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

@@ -243,8 +243,6 @@
             <if test="entryTime != null">entry_time,</if>
             <if test="exitTime != null">exit_time,</if>
             <if test="remark != null">remark,</if>
-            <if test="projectKml != null">project_kml,</if>
-            <if test="projectCp != null">project_cp,</if>
             <if test="kmlLng != null">kml_lng,</if>
             <if test="kmlLat != null">kml_lat,</if>
             <if test="cars != null">cars,</if>
@@ -282,8 +280,6 @@
             <if test="entryTime != null">#{entryTime},</if>
             <if test="exitTime != null">#{exitTime},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="projectKml != null">#{projectKml},</if>
-            <if test="projectCp != null">#{projectCp},</if>
             <if test="kmlLng != null">#{kmlLng},</if>
             <if test="kmlLat != null">#{kmlLat},</if>
             <if test="cars != null">#{cars},</if>
@@ -324,8 +320,8 @@
             <if test="entryTime != null">entry_time = #{entryTime},</if>
             <if test="exitTime != null">exit_time = #{exitTime},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="projectKml != null">project_kml = #{projectKml},</if>
-            <if test="projectCp != null">project_cp = #{projectCp},</if>
+            project_kml = #{projectKml},
+            project_cp = #{projectCp},
             <if test="kmlLng != null">kml_lng = #{kmlLng},</if>
             <if test="kmlLat != null">kml_lat = #{kmlLat},</if>
             <if test="cars != null">cars = #{cars},</if>

oa-ui/src/views/file/filesProject/project.vue

@@ -200,7 +200,7 @@
             <el-form-item label="范围kml" prop="projectKml">
               <div style="display: flex;">
                 <div style="width: 100%;">
-                  <el-input v-model="kmlFileName" disabled v-if="isUpdate" placeholder="请选择kml文件"></el-input>
+                  <el-input v-model="kmlFileName" v-if="isUpdate" placeholder="请选择kml文件"></el-input>
                 </div>
                 <div>
                   <el-upload ref="uploadProKml" class="upload-demo" :headers="upload.headers" action=""
@@ -222,7 +222,7 @@
             <el-form-item label="控制点Kml" prop="projectCp">
               <div style="display: flex;">
                 <div style="width: 100%;">
-                  <el-input v-model="cpFileName" disabled v-if="isUpdate" placeholder="请选择kml文件"></el-input>
+                  <el-input v-model="cpFileName" v-if="isUpdate" placeholder="请选择kml文件"></el-input>
                 </div>
                 <div>
                   <el-upload ref="uploadProCPKml" class="upload-demo" :headers="upload.headers" action="l"

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

@@ -53,6 +53,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>
@@ -71,8 +72,13 @@
       <el-table-column label="购买价格（元）" align="center" prop="cost" />
       <!-- <el-table-column label="预计使用年限" align="center" prop="expectLife" />
       <el-table-column label="单日成本（元）" align="center" prop="dayCost" />
-      <el-table-column label="存放地点" align="center" prop="place" />
-      <el-table-column label="管理部门" align="center" prop="dept.deptName" /> -->
+      <el-table-column label="存放地点" align="center" prop="place" /> -->
+      <el-table-column label="管理部门" align="center" prop="manageDept" >
+        <template slot-scope="scope">
+          <span>{{ getDeptName(scope.row.manageDept) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="使用人" align="center" prop="deviceUser" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
@@ -157,15 +163,30 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="管理部门" prop="dept.deptName">
-          <el-select v-model="form.manageDept" filterable placeholder="请选择" clearable>
-            <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
-              :value="item.deptId">
-            </el-option>
-          </el-select>
-        </el-form-item>
+        
         <el-row :gutter="20">
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item label="管理部门" prop="manageDept">
+              <el-select v-model="form.manageDept" filterable placeholder="请选择" clearable>
+                <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+                  :value="item.deptId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备编码" prop="deviceNumber">
+              <el-input v-model="form.deviceNumber" placeholder="请输入设备编码" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="使用人" prop="deviceUser">
+              <el-input v-model="form.deviceUser" placeholder="请输入使用人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" />
             </el-form-item>