一日流程评估 优化

ruoyi-ui/src/views/benyi/dayflowassessment/index.vue

@@ -123,6 +123,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
+            v-show="!checkRemoveable(scope.row)"
             @click="handleDelete(scope.row)"
             v-hasPermi="['benyi:dayflowassessment:remove']"
             >删除</el-button
@@ -341,6 +342,16 @@ export default {
 
       return status == "1" || !this.CompareDate(row.createTime, y + "/" + m);
     },
+    //控制按钮可用
+    checkRemoveable(row) {
+      console.log(row.remark);
+      var remark = row.remark;
+      if (remark == "" || remark == null) {
+        return false;
+      } else {
+        return true;
+      }
+    },
     //比较日期大小
     CompareDate(d1, d2) {
       //return new Date(d1.replace(/-/g, "/")) > new Date(d2.replace(/-/g, "/"));

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java

@@ -137,16 +137,16 @@ public class ByDayflowassessmentController extends BaseController {
             String classId = byDayflowassessment.getClassid();
             ByClass byClass = byClassService.selectByClassById(classId);
             if (byClass != null) {
-                Long deptId=SecurityUtils.getLoginUser().getUser().getDeptId();
+                Long deptId = SecurityUtils.getLoginUser().getUser().getDeptId();
-                Long userId=SecurityUtils.getLoginUser().getUser().getUserId();
+                Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
-                String xnXq=schoolCommon.getCurrentXnXq();
+                String xnXq = schoolCommon.getCurrentXnXq();
                 byDayflowassessment.setDeptId(deptId);
                 byDayflowassessment.setCreateUserid(userId);
                 byDayflowassessment.setXnxq(xnXq);
                 //获取总得分
-                Double dTotal=GetDf(byDayflowassessment.getList());
+                Double dTotal = GetDf(byDayflowassessment.getList());
                 byDayflowassessment.setZzdf(dTotal);
-                if(byClass.getZbjs()==null){
+                if (byClass.getZbjs() == null) {
                     return AjaxResult.error("未设置班级主班教师，请学校管理员设置班级信息");
                 }
                 System.out.println(byClass.getZbjs().longValue() == pgdx.longValue());
@@ -183,7 +183,7 @@ public class ByDayflowassessmentController extends BaseController {
         } else {
             //id 不为空，说明是修改
             ByDayflowassessment byDayflowassessmentModel = byDayflowassessmentService.selectByDayflowassessmentById(byDayflowassessment.getId());
-            Double dTotal=GetDf(byDayflowassessment.getList());
+            Double dTotal = GetDf(byDayflowassessment.getList());
             byDayflowassessmentModel.setZzdf(dTotal);
             byDayflowassessmentModel.setList(byDayflowassessment.getList());
             byDayflowassessmentModel.setStatus(byDayflowassessment.getStatus());
@@ -209,9 +209,9 @@ public class ByDayflowassessmentController extends BaseController {
                     System.out.println("未设置主班教师");
                 } else {
                     //主班教师被评估记录的id
-                    ByDayflowassessment byDayflowassessmentZbjs=new ByDayflowassessment();
+                    ByDayflowassessment byDayflowassessmentZbjs = new ByDayflowassessment();
                     byDayflowassessmentZbjs.setRemark(byDayflowassessmentModel.getId().toString());
-                    Long id=byDayflowassessmentService.selectByDayflowassessmentList(byDayflowassessmentZbjs).get(0).getId();
+                    Long id = byDayflowassessmentService.selectByDayflowassessmentList(byDayflowassessmentZbjs).get(0).getId();
                     //清空item
                     byDayflowassessmentitemService.deleteByDayflowassessmentitemByPid(id);
                     byDayflowassessmentNew.setId(id);
@@ -291,6 +291,19 @@ public class ByDayflowassessmentController extends BaseController {
     @Log(title = "幼儿园一日流程评估", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
+        //判断当前评估是不是配班和助理教师评估，如果是的话，应该删除对应的主班教师评估
+        for (int i = 0; i < ids.length; i++) {
+            ByDayflowassessment byDayflowassessment = new ByDayflowassessment();
+            byDayflowassessment.setRemark(ids[i].toString());
+            List<ByDayflowassessment> list = byDayflowassessmentService.selectByDayflowassessmentList(byDayflowassessment);
+            if (list != null && list.size() > 0) {
+                Long newId=list.get(0).getId();
+                //删除item数据
+                byDayflowassessmentitemService.deleteByDayflowassessmentitemByPid(newId);
+                //删除主数据
+                byDayflowassessmentService.deleteByDayflowassessmentById(newId);
+            }
+        }
         //先删除item数据
         for (int i = 0; i < ids.length; i++) {
             byDayflowassessmentitemService.deleteByDayflowassessmentitemByPid(ids[i]);

ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml

@@ -69,7 +69,7 @@
     </resultMap>
 
     <sql id="selectByDayflowassessmentVo">
-        select d.id, d.planid, d.dept_id, d.classid, e.bjmc, d.bzbh, d.bzxm, d.pbbh, d.pbxm, d.zlbh, d.zlxm, d.xnxq, d.bzid, d.bzmf, d.kfz, d.kfcs, d.zzdf, d.classdf, d.items, d.values, d.pgdx, f.nick_name as pgdxxm, d.create_userid, d.create_time, d.status,
+        select d.id, d.planid, d.dept_id, d.classid, e.bjmc, d.bzbh, d.bzxm, d.pbbh, d.pbxm, d.zlbh, d.zlxm, d.xnxq, d.bzid, d.bzmf, d.kfz, d.kfcs, d.zzdf, d.classdf, d.items, d.values, d.pgdx, f.nick_name as pgdxxm, d.create_userid, d.create_time, d.status, d.remark,
          (select sum(b.value) from by_dayflowassessmentitem b where d.id=b.pid and b.item in (select id from by_day_flow where name='早间接待')) as zjjdpjf,
 (select sum(b.value) from by_dayflowassessmentitem b where d.id=b.pid and b.item in (select id from by_day_flow where name='用餐')) as ycpjf,
 (select sum(b.value) from by_dayflowassessmentitem b where d.id=b.pid and b.item in (select id from by_day_flow where name='早间坐圈')) as zjzqpjf,