上传维修检定附件前选择费用类型

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

@@ -308,8 +308,9 @@ public class SysUserController extends BaseController
         user.setCreateBy(getUsername());
         if (user.getPoliticalAffiliation() == null || user.getPoliticalAffiliation().equals(""))
             user.setPoliticalAffiliation("13");
-        String pinyin = Pinyin4jUtil.getPinyin(user.getNickName());
-        user.setPinyin(pinyin.contains(",") ? pinyin.split(",")[0] : pinyin);
+//        String pinyin = Pinyin4jUtil.getPinyin(user.getNickName());
+//        user.setPinyin(pinyin.contains(",") ? pinyin.split(",")[0] : pinyin);
+        user.setPinyin(user.getUserName());
         Long[] roleIds = new Long[1];
         roleIds[0] = 2L;
         user.setRoleIds(roleIds);

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

@@ -20,14 +20,19 @@ public class CmcProjectWorkload extends BaseEntity
     /** 工作量id */
     private Long workloadId;
 
-    /** 项目id */
-    @Excel(name = "项目id")
+    /** 项目id */    
     private String projectId;
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 项目信息 */
+    private CmcProject project;
 
     /** 工作内容 */
     @Excel(name = "工作内容")
     private String content;
-
     /** 等级或比例尺 */
     @Excel(name = "等级或比例尺")
     private String scale;
@@ -108,6 +113,17 @@ public class CmcProjectWorkload extends BaseEntity
     {
         return finishTime;
     }
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
 
     @Override
     public String toString() {

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

@@ -13,19 +13,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="workload"    column="workload"    />
         <result property="finishTime"    column="finish_time"    />
         <result property="remark"    column="remark"    />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+    </resultMap>
+
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
     </resultMap>
 
     <sql id="selectCmcProjectWorkloadVo">
-        select workload_id, project_id, content, scale, unit, workload, finish_time, remark from cmc_project_workload
+        select pw.workload_id, pw.project_id, pw.content, pw.scale, pw.unit, pw.workload, pw.finish_time, pw.remark, p.project_number, p.project_name from cmc_project_workload as pw
+        left join cmc_project as p on pw.project_id = p.project_id
     </sql>
 
     <select id="selectCmcProjectWorkloadList" parameterType="CmcProjectWorkload" resultMap="CmcProjectWorkloadResult">
         <include refid="selectCmcProjectWorkloadVo"/>
         <where>  
-            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
-            <if test="content != null  and content != ''"> and content like concat('%', #{content}, '%')</if>
-            <if test="scale != null  and scale != ''"> and scale like concat('%', #{scale}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="projectId != null  and projectId != ''"> and pw.project_id = #{projectId}</if>
+            <if test="content != null  and content != ''"> and pw.content like concat('%', #{content}, '%')</if>
+            <if test="scale != null  and scale != ''"> and pw.scale like concat('%', #{scale}, '%')</if>
+            <if test="unit != null  and unit != ''"> and pw.unit like concat('%', #{unit}, '%')</if>
             <if test="workload != null  and workload != ''"> and workload = #{workload}</if>
             <if test="finishTime != null "> and finish_time like concat('%', #{finishTime}, '%')</if>
         </where>

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

@@ -202,6 +202,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        expenseType: [
+          { required: true, message: '请选择费用类型', trigger: 'change' }
+        ]
       },
       deviceList: [],
       alldeviceList: [],
@@ -293,7 +296,7 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改设备维保记录";
-        expenseTypePath(this.form.expenseType);
+        this.expenseTypePath(this.form.expenseType);
       });
     },
     /** 提交按钮 */
@@ -371,6 +374,10 @@ export default {
     },
     //费用附件路径
     getExpensePath(val) {
+      if (!this.form.expenseType) {
+        this.$modal.msgError("请先选择费用类型");
+        return;
+      }
       let arr = val.split('/upload')
       this.form.document = arr[1]
       if (val == "") {