update baojiGroupBattGroup# processSurvey#

whycrzg

2021-02-02 086b0d677e761bb5d528e6f29232d663af6e83c7

 src/main/java/com/fgkj/services/User_taskService.java

@@ -253,33 +253,31 @@
     public ServiceModel delete(User_task obj) {
      TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
      ServiceModel model = new ServiceModel();
      Boolean bl=true;
      if (obj.getTask_type()==2){
         if (!(mapper.del(obj)>0)) {
            bl=false;
      Boolean bl = true;
      try {
         if (obj.getTask_type() == 2) {
            bl = mapper.del(obj) > 0;
            if (bl) bl = mapper.delsqlC(obj) > 0;   //check
         } else {
            bl = mapper.del(obj) > 0;
            if (bl) bl = mapper.delsqlT(obj) > 0;   //test
         }
         if (!(mapper.delsqlC(obj)>0)) {
            bl=false;
         }
      }else{
         if (!(mapper.del(obj)>0)) {
            bl=false;
         }
         if (!(mapper.delsqlT(obj)>0)) {
            bl=false;
         }
      }
        if(bl){
         dataSourceTransactionManager.commit(transactionStatus);
           model.setCode(1);
           model.setMsg("删除作业成功!");
        }
        else{
      } catch (Exception e) {
         e.printStackTrace();
         dataSourceTransactionManager.rollback(transactionStatus);
           model.setMsg("删除作业失败!");
        }
        return model;	
     }
         model.setMsg("删除作业失败!");
         return model;
      }
      if (bl) {
         dataSourceTransactionManager.commit(transactionStatus);
         model.setCode(1);
         model.setMsg("删除作业成功!");
      } else {
         dataSourceTransactionManager.rollback(transactionStatus);
         model.setMsg("删除作业失败!");
      }
      return model;
   }
     
    //4.1作业管理查询user_task所有信息
    public ServiceModel serchByCondition(Task_Batt_Test tbt){