提交代码

ruoyi-ui/src/views/project/surProjectInsurance/index.vue

@@ -262,7 +262,7 @@
         <el-form-item label="保保单号" prop="insuranceNumber">
           <el-input v-model="form.insuranceNumber" placeholder="请输入保保单号" />
         </el-form-item>
-        <el-form-item label="保险文书" prop="insuranceFile">
+        <el-form-item label="保险合同" prop="insuranceFile">
           <file-upload v-model="form.insuranceFile" />
         </el-form-item>
         <el-form-item label="保险状态" prop="insuranceState">
@@ -361,8 +361,14 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        projectId: [{ required: true, message: "项目主键不能为空", trigger: "blur" }],
+        insuranceType: [{ required: true, message: "请选择保险类型", trigger: "blur" }],
-        deptId: [{ required: true, message: "部门主键不能为空", trigger: "blur" }],
+        companyName: [
+          { required: true, message: "请输入保险公司名称", trigger: "blur" },
+          { max: 20, message: "请输入", trigger: "blur" },
+        ],
+        insuranceNumber: [
+          { required: true, message: "请输入保险单编号", trigger: "blur" },
+        ],
       },
     };
   },
@@ -442,6 +448,16 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          if (
+            this.form.insuranceFile != null &&
+            this.form.insuranceFile != "" &&
+            this.form.insuranceFile.length > 0
+          ) {
+            this.form.insuranceFile = this.form.insuranceFile[0].url;
+          } else {
+            this.$modal.msgWarning("请上传保险合同");
+            return false;
+          }
           if (this.form.id != null) {
             updateSurProjectInsurance(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");

ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue

@@ -30,7 +30,7 @@
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
-            v-hasPermi="['project:surProjectUserInfo:add']"
+            v-hasPermi="['project:surProjectInsurance:add']"
             >办理保险</el-button
           >
         </el-col>
@@ -181,11 +181,12 @@ export default {
       rules: {
         insuranceType: [{ required: true, message: "请选择保险类型", trigger: "blur" }],
         companyName: [
-          { required: true, message: "请选择所属单位", trigger: "blur" },
+          { required: true, message: "请输入保险公司名称", trigger: "blur" },
           { max: 20, message: "请输入", trigger: "blur" },
         ],
-        jobType: [{ required: true, message: "请选择职务类型", trigger: "blur" }],
+        insuranceNumber: [
-        userIds: [{ required: true, message: "请选择项目人员", trigger: "blur" }],
+          { required: true, message: "请输入保险单编号", trigger: "blur" },
+        ],
       },
       surProjectInsuranceList: [],
       activeName: "",

yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml

@@ -58,8 +58,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN sur_project_insurance spi ON spi.project_id = sp.id
         AND spi.insurance_type = sdd.dict_value
         AND spi.is_del = 0
-        <!--监理单位/总包公司/分包单位-->
-        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if>
         <!--普通用户查询项目人员-->
         <if test='nowRole == "99"'> left join sur_project_userinfo spu on spu.project_id = sp.id</if>
         <where>

yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkAttendanceMapper.xml

@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and spwa.is_del=0
             <if test="projectId != null "> and spwa.project_id = #{projectId}</if>
             <if test="deptId != null "> and spwa.dept_id = #{deptId}</if>
-            <if test="workDate != null"> and DATE_FORMAT(spwa.work_date,'%Y-%m-%d')=DATE_FORMAT(#{workDate},'%Y-%m-%d')</if>
+            <if test="workDate != null"> and date(spwa.work_date)=date(#{workDate})</if>
         </where>
         <if test="projectId != null "> group by spwa.project_id</if>
         <if test="deptId != null and projectId == null"> group by spwa.dept_id</if>