src/main/java/com/fgkj/controller/User_taskController.java
@@ -73,16 +73,20 @@ ServiceModel model = new ServiceModel(); List list=service.serchBattgroup(bmd); model.setCode(1); model.setData(list); if (list.size()>0) { model.setCode(1); model.setData(list); } return model; } //0.1查询指定用户的作业信息 @GetMapping("byUid") public ServiceModel serchByUid(@RequestBody Task_Batt_Test tbt){ User_inf user=(User_inf)ActionUtil.getSession().getAttribute("user"); ServiceModel model=new ServiceModel(); public ServiceModelOnce serchByUid(@RequestBody Task_Batt_Test tbt){ User_inf user=(User_inf)ActionUtil.getSession().getAttribute("user"); // User_inf user= new User_inf(); // user.setuId(1001); ServiceModelOnce model=new ServiceModelOnce(); if(user!=null && tbt!=null){ tbt.setUinf(user); model=service.serchByUid(tbt); src/main/java/com/fgkj/dto/ServiceModelImpl2.java
New file @@ -0,0 +1,13 @@ package com.fgkj.dto; public class ServiceModelImpl2 extends ServiceModel{ public String msgO; public String getMsgO() { return msgO; } public void setMsgO(String msgO) { this.msgO = msgO; } } src/main/java/com/fgkj/mapper/impl/BattInfMapper.java
@@ -2,6 +2,7 @@ import com.fgkj.dto.BattInf; import com.fgkj.dto.BattMap_information; import com.fgkj.dto.Batt_Maint_Dealarm; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; @@ -157,7 +158,8 @@ public List serchByBattgroupId(Object obj); //3.1/3.2/0.1/6.2/6.4.3/6.4.4根据battgroupid查机房名称和电池组名称/查capstdolstd/moncount/serstd public List serchByCondition(Object obj); @Select("select distinct(stationname),battgroupname,moncapstd,monserstd,monvolstd,moncount from db_battinf.tb_battinf where battgroupid=#{battGroupId} ") public List<BattInf> serchByCondition(BattInf obj); //1.1根据选择的信息查满足条件的battgroupid /*public List serchByConditionNew(Object obj) { @@ -707,7 +709,7 @@ public List serchByTestType(Object obj); //4.1作业管理——创建模板查询 public List serchBattgroup(Object obj); public List serchBattgroup(Batt_Maint_Dealarm obj); //8.1放电计划管理中查询(旧版本) public List serchBattgroupinfo1(Object obj); src/main/java/com/fgkj/mapper/impl/User_infMapper.java
@@ -2,6 +2,7 @@ import com.fgkj.dto.Batt_User_Permit; import com.fgkj.dto.User_battgroup_baojigroup; import com.fgkj.dto.User_battgroup_baojigroup_battgroup; import com.fgkj.dto.User_inf; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; @@ -44,7 +45,12 @@ public List<User_battgroup_baojigroup> serchByInfo(User_inf obj); //根据battgroupid查对应的包机人 public List searchByBattGroupId(Object obj); @Select("select distinct(db_user.tb_user_inf.uid),db_user.tb_user_inf.uName,db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId " + "from db_user.tb_user_inf ,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr " + "where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id " + "and db_user.tb_user_battgroup_baojigroup_usr.uId=db_user.tb_user_inf.uid " + "and db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=#{BattGroupId} and db_user.tb_user_inf.uBaojiUsr=1 ") public List<User_inf> searchByBattGroupId(User_battgroup_baojigroup_battgroup obj); //根据uId查用户姓名 @Select("select UName from db_user.tb_user_inf where uId=#{uId}") src/main/java/com/fgkj/mapper/impl/User_taskMapper.java
@@ -2,6 +2,10 @@ import java.util.List; import com.fgkj.dto.Task_Batt_Test; import com.fgkj.dto.User_task; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Update; import org.springframework.stereotype.Repository; public interface User_taskMapper{ @@ -12,12 +16,14 @@ public String addPro(Object obj); //4.1作业管理(修改作业名称，作业使能，作业开始时间，作业提醒次数，作业提醒时间，作业主管提醒使能,确认作业,确认作业时间，完成作业，完成作业确认) public boolean update(Object obj); @Update("update db_user.tb_user_task set task_name=#{task_name},task_enabled=#{task_enabled},task_start_date=#{task_start_date},task_notice_sum=#{task_notice_sum},task_notice_starttime=#{task_notice_starttime},task_notice_endtime=#{task_notice_endtime},task_confirm=#{task_confirm},task_confirm_date=#{task_confirm_date},task_complete=#{task_complete},task_complete_confirm=#{task_complete_confirm},notice_master_enabled=#{notice_master_enabled} where task_id=#{task_id}") public int update(User_task obj); //4.1作业管理(增加一条新的作业时，要将最新的一条作业的task_id_ex值+1) public String updatePro(Object obj); //4.1作业管理(作业删除) public boolean del(Object obj); @Delete("delete from db_user.tb_user_task where task_id=#{task_id}") public int del(User_task obj); public List searchAll() ; @@ -26,12 +32,15 @@ //0.1首页根据uid查询对应人的作业 public List serchByInfo(Object obj); public List serchByInfo(Task_Batt_Test obj); //0.1作业管理查询user_task所有信息 public List serchByTask(Object obj); public List serchByTask(Task_Batt_Test obj); //4.1查询当前最大的task_id public List serchMaxId(); @Delete("delete from db_user.tb_user_task_batt_check where task_id=#{task_id}") int delsqlC(User_task obj); @Delete("delete from db_user.tb_user_task_batt_test where task_id=#{task_id}") int delsqlT(User_task obj); } src/main/java/com/fgkj/mapper/impl/User_task_batt_checkMapper.java
@@ -28,6 +28,7 @@ //4.1根据task_id查询user_task_batt_check信息 public List<Task_Batt_Test> serchByCondition1(User_task_batt_check obj) ;// 不同bean参数调用 task_id public List serchByCondition(Object obj) ; public List serchByCondition(User_task obj) ; } src/main/java/com/fgkj/mapper/impl/User_task_batt_testMapper.java
@@ -2,6 +2,8 @@ import java.util.List; import com.fgkj.dto.User_task; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; public interface User_task_batt_testMapper{ @@ -22,7 +24,7 @@ public List searchAll() ; //4.1根据task_id查询user_task_batt_test信息 public List serchByCondition(Object obj) ; public List serchByCondition(User_task obj) ; //4.6作业报表(根据电池组信息以及统计方式查询user_task_batt_test信息) public List serchByInfo(Object obj) ; src/main/java/com/fgkj/services/User_infService.java
@@ -109,8 +109,8 @@ } // 根据battgroupid查对应的包机人 public ServiceModel searchByBattGroupId(Object obj) { model = new ServiceModel(); public ServiceModelImpl2 searchByBattGroupId(User_battgroup_baojigroup_battgroup obj) { ServiceModelImpl2 model = new ServiceModelImpl2(); List<User_inf> list = mapper.searchByBattGroupId(obj); // System.out.println(list.size()); /* @@ -131,13 +131,13 @@ uStrN = uStrN.substring(1, uStrN.length()); uStrI = uStrI.substring(1, uStrI.length()); //TODO perry /*model.setMsg(uStrN); model.setMsgO(uStrI);*/ model.setMsg(uStrN); model.setMsgO(uStrI); } else { model.setCode(0); } // System.out.println(model.getMsg()); // System.out.println(model); // System.out.println(model.getMsg()); // System.out.println(model); return model; }
@@ -6,7 +6,11 @@ import com.fgkj.mapper.UtilityFactory; import com.fgkj.mapper.impl.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.stereotype.Service; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.annotation.Transactional; import java.text.ParseException; import java.util.ArrayList; @@ -16,7 +20,11 @@ import javax.annotation.Resource; @Service public class User_taskService { @Autowired DataSourceTransactionManager dataSourceTransactionManager; @Autowired TransactionDefinition transactionDefinition; // private ServiceModel model = new ServiceModel(); @@ -225,9 +233,9 @@ } //4.1作业管理(修改作业名称，作业使能，作业开始时间，作业提醒次数，作业提醒时间，作业主管提醒使能,确认作业，完成作业，完成作业确认) public ServiceModel update(Object obj) { public ServiceModel update(User_task obj) { ServiceModel model = new ServiceModel(); Boolean bl=mapper.update(obj); Boolean bl=mapper.update(obj)>0; if(bl){ model.setCode(1); model.setMsg("修改成功!"); @@ -238,21 +246,39 @@ return model; } //4.1作业管理(作业删除) public ServiceModel delete(Object obj) { public ServiceModel delete(User_task obj) { TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition); ServiceModel model = new ServiceModel(); Boolean bl=mapper.del(obj); Boolean bl=true; if (obj.getTask_type()==2){ if (!(mapper.del(obj)>0)) { bl=false; } 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{ dataSourceTransactionManager.rollback(transactionStatus); model.setMsg("删除作业失败!"); } return model; } //4.1作业管理查询user_task所有信息 public ServiceModel serchByCondition(Object obj){ public ServiceModel serchByCondition(Task_Batt_Test obj){ ServiceModel model = new ServiceModel(); Task_Batt_Test tbt = (Task_Batt_Test) obj; List<Task_Batt_Test> list = mapper.serchByCondition(tbt); @@ -309,7 +335,7 @@ return model; } //4.1根据task_id查询user_task_test/user_task_check public ServiceModel serchByInfo(Object obj){ public ServiceModel serchByInfo(User_task obj){ ServiceModel model = new ServiceModel(); User_task utask=(User_task) obj; @@ -334,10 +360,11 @@ } } } // for (Task_Batt_Test t : list) { // System.out.println(t.getUtest().getNote()); // } //System.out.println(list.size()); for (Task_Batt_Test t : list) { System.out.println("t = " + t); // System.out.println(t.getUtest().getNote()); } System.out.println(list.size()); if(list!=null && list.size()>0){ model.setCode(1); model.setData(list); @@ -345,32 +372,40 @@ return model; } //4.1查询符合条件的电池组信息(创建作业) public List serchBattgroup(Object obj){ ServiceModel model = new ServiceModel(); public List serchBattgroup(Batt_Maint_Dealarm obj){ // ServiceModelImpl2 model = new ServiceModelImpl2(); Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj; User_battgroup_baojigroup_battgroup ugroup=new User_battgroup_baojigroup_battgroup(); List<Batt_Maint_Dealarm> list = battInfMapper.serchBattgroup(bmd); //System.out.println(list.size()); List<Batt_Maint_Dealarm> list = battInfMapper.serchBattgroup(bmd); //TODO 待完成 System.out.println(list.size()); // Batt_Maint_Dealarm e = new Batt_Maint_Dealarm(); // BattInf battInf = new BattInf(); // battInf.setBattGroupId(1000005); // e.setBinf(battInf); // list.add(e);//添加测试数据 List<ServiceModel> listAll=new ArrayList<ServiceModel>(); if(list!=null&&list.size()>=0){ for(int i=0;i<list.size();i++){ model=new ServiceModel(); ServiceModelImpl2 model=new ServiceModelImpl2(); //ServiceModel umodel=new ServiceModel(); ugroup.setBattGroupId(list.get(i).getBinf().getBattGroupId()); //查与指定battgroupid的包机人 ServiceModel umodel=uservice.searchByBattGroupId(ugroup); ServiceModelImpl2 umodel=uservice.searchByBattGroupId(ugroup); // if(umodel.getMsg()!=null&&umodel.getMsg().length()>0){ // System.out.println(umodel.getMsg()+" "+ umodel.getMsgO()); // } //System.out.println(umodel); model.setCode(1); model.setData(list.get(i)); model.setMsg(umodel.getMsg()); //TODO perry // model.setMsgO(umodel.getMsgO()); if (umodel.getCode().equals(1)) { model.setMsg(umodel.getMsg()); //TODO perry model.setMsgO(umodel.getMsgO()); } listAll.add(model); } }else{ ServiceModelImpl2 model=new ServiceModelImpl2(); model.setCode(0); listAll.add(model); } @@ -381,14 +416,21 @@ return listAll; } //0.1查询指定用户的作业信息 public ServiceModel serchByUid(Object obj){ ServiceModel model = new ServiceModel(); Task_Batt_Test tbt=(Task_Batt_Test) obj; public ServiceModelOnce serchByUid(Task_Batt_Test tbt){ ServiceModelOnce model = new ServiceModelOnce(); List<Task_Batt_Test> list = mapper.serchByInfo(tbt); for (int i = 0; i < list.size(); i++) { list.get(i).setPageBean(new PageBean());//TODO 获取方式? list.get(i).getPageBean().setPageAll(0); } //System.out.println("&&&& "+list.size()); //未完成数量 tbt.getUtask().setTask_complete(0); List<Task_Batt_Test> listU = mapper.serchByInfo(tbt); for (int i = 0; i < listU.size(); i++) { listU.get(i).setPageBean(new PageBean()); listU.get(i).getPageBean().setPageAll(0); } //int count = 0; //统计未完成的作业数量 if(list!=null && list.size()>0){ for(int i=0;i<list.size();i++){ @@ -405,14 +447,17 @@ } List<BattInf> listb=battInfMapper.serchByCondition(binf); if(listb!=null&&listb.size()>0){ //System.out.println(listb.get(0).getBattGroupName()+" "+listb.get(0).getStationName()); list.get(i).getBinf().setBattGroupName(listb.get(0).getBattGroupName()); // System.out.println(listb.get(0).getBattGroupName()+" "+listb.get(0).getStationName()); System.out.println("list.get("+i+")= " + list.get(i)); list.get(i).setBinf(new BattInf());//测试添加 list.get(i).getBinf().setBattGroupName(listb.get(0).getBattGroupName());//TODO 数据不足 java.lang.NullPointerException: null list.get(i).getBinf().setStationName(listb.get(0).getStationName()); // System.out.println(i+" "+list.get(i).getBinf().getBattGroupName()+" "+list.get(i).getBinf().getStationName()); } //System.out.println(list.get(i).getUtest().getTask_usr_ids()); System.out.println(list.get(i).getUtest().getTask_usr_ids()); if(list.get(i).getUtest().getTask_usr_ids()!=null){ user.setuId(Integer.parseInt(list.get(i).getUtest().getTask_usr_ids())); String task_usr_ids = list.get(i).getUtest().getTask_usr_ids(); user.setuId(Integer.parseInt(task_usr_ids)); }else if(list.get(i).getUcheck().getTask_usr_ids()!=null){ user.setuId(Integer.parseInt(list.get(i).getUcheck().getTask_usr_ids())); } @@ -430,11 +475,11 @@ model.setData(list); // model.setSum(count); //TODO perry /*if(listU!=null && listU.size()>0){ model.setSum(listU.get(0).getPageInfo().getPageAll()); if(listU!=null && listU.size()>0){ model.setSum(listU.get(0).getPageBean().getPageAll()); }else{ model.setSum(0); }*/ } }else{ model.setCode(0); model.setMsg("查询失败!"); @@ -451,11 +496,10 @@ } //0.1作业管理查询user_task所有信息 public ServiceModel serchByTask(Object obj){ public ServiceModel serchByTask(Task_Batt_Test tbt){ ServiceModel model = new ServiceModel(); Task_Batt_Test tbt=(Task_Batt_Test) obj; List<Task_Batt_Test> list=mapper.serchByTask(tbt); //System.out.println(list.size()); System.out.println(list.size()); if(list!=null&&list.size()>0){ for(int i=0;i<list.size();i++){ list.get(i).getUinf().setuName(UtilityFactory.UidsToUnames(list.get(i).getBinf().getStationName1())); src/main/java/com/fgkj/services/User_task_batt_testService.java
@@ -1,5 +1,6 @@ package com.fgkj.services; import com.fgkj.dto.User_task; import com.fgkj.util.*; import com.fgkj.dto.ServiceModel; import com.fgkj.dto.Task_Batt_Test; @@ -212,7 +213,7 @@ return last; } public ServiceModel serchByCondition(Object obj){ public ServiceModel serchByCondition(User_task obj){ ServiceModel model = new ServiceModel(); List list=mapper.serchByCondition(obj); // for (Object object : list) { src/main/resources/mapper/BattInfMapper.xml
@@ -1,6 +1,48 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.fgkj.mapper.impl.BattInfMapper" > <resultMap id="BaseResultMap" type="Batt_Maint_Dealarm"> <association property="binf" javaType="BattInf"> <result column="battGroupId" property="battGroupId"></result> <result column="stationId" property="stationId"></result> <result column="stationName" property="stationName"></result> <result column="stationName1" property="stationName1"></result> <result column="stationIp" property="stationIp"></result> <result column="battGroupName" property="battGroupName"></result> <result column="battGroupName1" property="battGroupName1"></result> <result column="battGroupNum" property="battGroupNum"></result> <result column="monCount" property="monCount"></result> <result column="monCapStd" property="monCapStd"></result> <result column="monVolStd" property="monVolStd"></result> <result column="battProducer" property="battProducer"></result> <result column="battProductDate" property="battProductDate"></result> <result column="battInUseDate" property="battInUseDate"></result> </association> <association property="mainf" javaType="Batt_maint_inf"> <result column="maint_done_time" property="maint_done_time"></result> </association> <association property="tdata" javaType="Batttestdata_inf"> <result column="battGroupId" property="battGroupId"></result> <result column="test_record_count" property="test_record_count"></result> <result column="test_starttime" property="test_starttime"></result> <result column="test_type" property="test_type"></result> <result column="test_curr" property="test_curr"></result> <result column="test_timelong" property="test_timelong"></result> <result column="max_monvol" property="max_monvol"></result> <result column="min_monvol" property="min_monvol"></result> <result column="test_cap" property="test_cap"></result> <result column="data_new" property="data_new"></result> </association> <association property="pageBean" javaType="Page"> </association> <association property="uinf" javaType="User_inf"> <result column="uId" property="uId"></result> <result column="uSnId" property="uSnId"></result> <result column="uName" property="uName"></result> </association> </resultMap> <!-- //添加新的电池组(多个) @@ -4287,11 +4329,108 @@ <select id="serchByDeviceId" resultType="java.lang.Integer"></select> <select id="serchByMonNum" resultType="java.util.List"></select> <select id="serchByBattgroupId" resultType="java.util.List"></select> <select id="serchByCondition" resultType="java.util.List"></select> <!-- <select id="serchByCondition" resultType="java.util.List"></select>--> <select id="serchByConditionNew" resultType="java.util.List"></select> <select id="serchGroupAssess" resultType="java.util.List"></select> <select id="serchByTestType" resultType="java.util.List"></select> <select id="serchBattgroup" resultType="java.util.List"></select> <select id="serchBattgroup" resultMap="BaseResultMap"> select distinct(db_battinf.tb_battinf.BattgroupId),StationName1,StationName,stationip,BattGroupName,BattGroupName1,battgroupnum,moncount,moncapstd,monvolstd,battproducer,battproductdate,battinusedate ,maint_done_time,test_record_count,test_starttime,test_type,test_curr,test_timelong,max_monvol,min_monvol,test_cap,data_new ,db_user.tb_user_battgroup_baojigroup_battgroup.battgroupid as uSnId,db_user.tb_user_inf.uId,db_user.tb_user_inf.uName from db_battinf.tb_battinf left outer join db_battinf.tb_batt_maint_inf on db_battinf.tb_battinf.BattgroupId=db_battinf.tb_batt_maint_inf.BattGroupId left outer join db_batt_testdata.tb_batttestdata_inf on db_battinf.tb_battinf.BattgroupId=db_batt_testdata.tb_batttestdata_inf.BattGroupId left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.battgroupid=db_battinf.tb_battinf.BattgroupId left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id= db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id left outer join db_user.tb_user_inf on db_user.tb_user_inf.uId=db_user.tb_user_battgroup_baojigroup_usr.uid where stationname1 like '%${binf.stationName1}%' and stationname like '%${binf.stationName}%' and battproducer like '%${binf.battProducer}%' and to_days(battProductDate)>=to_days(#{binf.battProductDate}) and to_days(battproductdate) <![CDATA[<=]]> to_days(#{binf.battProductDate1}) and to_days(battinusedate) <![CDATA[>=]]> to_days(#{binf.battInUseDate}) and to_days(battinusedate) <![CDATA[<=]]> to_days(#{binf.battInUseDate1}) <if test="tdata.test_type==2"> and db_battinf.tb_battinf.BattGroupId in(select distinct(db_batt_testdata.tb_batttestdata_inf.BattGroupId ) from db_batt_testdata.tb_batttestdata_inf where db_batt_testdata.tb_batttestdata_inf.test_type=#{tdata.test_type} and to_days(record_time)>=to_days(#{tdata.record_time}) and to_days(record_time) <![CDATA[<=]]> to_days(#{tdata.record_time})) </if> <if test="tdata.test_type==3"> and db_battinf.tb_battinf.BattGroupId in(select distinct(db_batt_testdata.tb_batttestdata_inf.BattGroupId ) from db_batt_testdata.tb_batttestdata_inf where db_batt_testdata.tb_batttestdata_inf.test_type=#{tdata.test_type} and to_days(record_time)>=to_days(#{tdata.record_time}) and to_days(record_time) <![CDATA[<=]]> to_days(#{tdata.record_time})) </if> <if test="tdata.test_type==9"> and db_battinf.tb_battinf.BattGroupId in(select distinct(db_batt_testdata.tb_batttestdata_inf.BattGroupId ) from db_batt_testdata.tb_batttestdata_inf where db_batt_testdata.tb_batttestdata_inf.test_type=#{tdata.test_type} and to_days(record_time)>=to_days(#{tdata.record_time}) and to_days(record_time) <![CDATA[<=]]> to_days(#{tdata.record_time})) </if> <if test="tdata.test_type==5"> and db_battinf.tb_battinf.BattGroupId in(select distinct(db_batt_testdata.tb_battresdata_inf.BattGroupId ) from db_batt_testdata.tb_battresdata_inf where db_batt_testdata.tb_battresdata_inf.test_type=#{tdata.test_type} and to_days(record_time)>=to_days(#{tdata.record_time}) and to_days(record_time) <![CDATA[<=]]> to_days(#{tdata.record_time})) </if> <if test="tdata.test_type==3000"> and db_battinf.tb_battinf.BattGroupId in(select distinct(db_batt_testdata.tb_batttestdata_inf.BattGroupId ) from db_batt_testdata.tb_batttestdata_inf where db_batt_testdata.tb_batttestdata_inf.test_type in(#{tdata.test_type},2,3) and to_days(record_time)>=to_days(#{tdata.record_time}) and to_days(record_time) <![CDATA[<=]]> to_days(#{tdata.record_time})) </if> <if test="tdata.test_type==4000"> and db_battinf.tb_battinf.BattGroupId not in(select distinct(db_batt_testdata.tb_batttestdata_inf.BattGroupId ) from db_batt_testdata.tb_batttestdata_inf where db_batt_testdata.tb_batttestdata_inf.test_type in(#{tdata.test_type},2,3) and to_days(record_time)>=to_days(#{tdata.record_time}) and to_days(record_time) <![CDATA[<=]]> to_days(#{tdata.record_time})) </if> <if test="tdata.test_type==0"> and db_battinf.tb_battinf.BattGroupId!=(select count(distinct(db_batt_testdata.tb_batttestdata_inf.BattGroupId )) from db_batt_testdata.tb_batttestdata_inf where db_batt_testdata.tb_batttestdata_inf.test_type in(#{tdata.test_type},2,3) and to_days(record_time)>=to_days(#{tdata.record_time}) and to_days(record_time) <![CDATA[<=]]> to_days(#{tdata.record_time})) </if> <if test="binf.BattGroupId==0"> and db_battinf.tb_battinf.battgroupid!=#{binf.battGroupId} </if> <if test="binf.BattGroupId!=0"> and db_battinf.tb_battinf.battgroupid=#{binf.battGroupId} </if> <if test="binf.BattGroupName=='其他'"> and BattGroupName1 like '%${binf.battGroupName1}%' </if> <if test="binf.BattGroupName!='其他'"> and BattGroupName1 not like '%开关电源系统%' and BattGroupName1 not like '%UPS系统%' and BattGroupName1 not like '%${binf.battGroupName1}%' </if> <if test="binf.monVolStd==0"> and monVolStd!=#{binf.monVolStd} </if> <if test="binf.monVolStd!=0"> and monVolStd=#{binf.monVolStd} </if> <if test="binf.monCapStd==0"> and monCapStd!=#{binf.monCapStd} </if> <if test="binf.monCapStd!=0"> and monCapStd=#{binf.monCapStd} </if> <if test="uinf.uName!=0"> <!-- 参数不为0使用条件 --> and db_user.tb_user_inf.uname=#{uinf.uName} and db_user.tb_user_inf.ubaojiusr=1 </if> <if test="tdata.test_starttype==1"> and test_starttype <![CDATA[<]]> 5 and test_type not in(2,9) and test_starttype!=2 </if> <if test="tdata.test_starttype==2"> and test_starttype>=5 or (test_type not in(2,9) and test_starttype=2) </if> <if test="mainf.remark==0"> and db_battinf.tb_battinf.BattGroupId in(select db_battinf.tb_batt_maint_inf.battgroupid from db_battinf.tb_batt_maint_inf where to_days(maint_done_time)>=to_days(#{mainf.maint_done_time}) and to_days(maint_done_time) <![CDATA[<=]]> to_days(#{mainf.maint_done_time1})) </if> <if test="mainf.remark==1"> and db_battinf.tb_battinf.BattGroupId not in(select db_battinf.tb_batt_maint_inf.battgroupid from db_battinf.tb_batt_maint_inf where to_days(maint_done_time)>=to_days(#{mainf.maint_done_time}) and to_days(maint_done_time) <![CDATA[<=]]> to_days(#{mainf.maint_done_time1})) </if> <if test="mainf.remark==100"> and db_battinf.tb_battinf.BattGroupId!=(select count(distinct(db_battinf.tb_batt_maint_inf.battgroupid )) from db_battinf.tb_batt_maint_inf where to_days(maint_done_time)>=to_days(#{mainf.maint_done_time}) and to_days(maint_done_time) <![CDATA[<=]]> to_days(#{mainf.maint_done_time1})) </if> order by StationName1 asc,db_battinf.tb_battinf.BattgroupId asc,test_starttime asc </select> <select id="serchBattgroupinfo1" resultType="java.util.List"></select> <select id="serchBattgroupinfo" resultType="java.util.List"></select> <select id="serchBattPlan" resultType="java.util.List"></select> src/main/resources/mapper/UserInfMapper.xml
@@ -612,7 +612,7 @@ <select id="serchByCondition" resultType="java.util.List"></select> <select id="serchinfoUname" resultType="java.util.List"></select> <!-- <select id="serchByInfo" resultType="java.util.List"></select>--> <select id="searchByBattGroupId" resultType="java.util.List"></select> <!-- <select id="searchByBattGroupId" resultType="java.util.List"></select>--> <!-- <select id="searchUnams" resultType="java.util.List"></select>--> <!--方法重载了,有问题,更新方法名--> <!-- <select id="searchAll" resultType="java.util.List"></select>--> src/main/resources/mapper/UserTaskBattCheckMapper.xml
@@ -260,5 +260,40 @@ and task_id = #{task_id} order by task_id </select> <select id="serchByCondition" resultType="java.util.List"></select> <select id="serchByCondition" resultMap="BaseResultMap"> select distinct(task_id), tb_user_task_batt_check.num, task_usr_ids, tb_user_task_batt_check.BattGroupId, task_enabled, task_exe_date, task_close_date, test_complete, test_completetime, batt_clean_done, batt_clean_done_result, batt_clean_done_recheck, batt_clean_done_recheck_result, batt_clean_done_recheck_check, batt_clean_done_recheck_check_result, battvol_tempe_done, battvol_tempe_done_result, battvol_tempe_done_recheck, battvol_tempe_done_recheck_result, battvol_tempe_done_recheck_check, battvol_tempe_done_recheck_check_result, battfault_check_done, battfault_check_done_result, battfault_check_done_recheck, battfault_check_done_recheck_result, battfault_check_done_recheck_check, battfault_check_done_recheck_check_result, stationname, battgroupname from db_user.tb_user_task_batt_check, db_battinf.tb_battinf where tb_user_task_batt_check.battgroupid = db_battinf.tb_battinf.battgroupid and task_id = #{task_id} order by task_id </select> </mapper> src/main/resources/mapper/UserTaskBattTestMapper.xml
@@ -1,7 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.fgkj.mapper.impl.User_task_batt_testMapper" > <resultMap id="BaseResultMap" type="Task_Batt_Test"> <association property="utest" javaType="User_task_batt_test"> <result column="num" property="num"></result> <result column="task_id" property="task_id"></result> <result column="task_usr_ids" property="task_usr_ids"></result> <result column="BattGroupId" property="battGroupId"></result> <result column="task_enabled" property="task_enabled"></result> <result column="task_exe_date" property="task_exe_date"></result> <result column="task_close_date" property="task_close_date"></result> <result column="task_notice_starttime" property="task_notice_starttime"></result> <result column="task_notice_endtime" property="task_notice_endtime"></result> <result column="task_notice_count" property="task_notice_count"></result> <result column="task_notice_latesttime" property="task_notice_latesttime"></result> <result column="task_notice_master" property="task_notice_master"></result> <result column="test_complete" property="test_complete"></result> <result column="test_completetime" property="test_completetime"></result> <result column="test_starttime" property="test_starttime"></result> <result column="test_record_count_id" property="test_record_count_id"></result> <result column="note" property="note"></result> </association> <association property="binf" javaType="BattInf"> <result column="battGroupId" property="battGroupId"></result> <result column="stationName" property="stationName"></result> <result column="battGroupName" property="battGroupName"></result> </association> </resultMap> <!-- public List getResults(ResultSet rs) { List list=new ArrayList(); @@ -323,6 +348,31 @@ <update id="updateTask"></update> <delete id="del"></delete> <select id="searchAll" resultType="java.util.List"></select> <select id="serchByCondition" resultType="java.util.List"></select> <select id="serchByCondition" resultMap="BaseResultMap"> select distinct(task_id), tb_user_task_batt_test.num, task_usr_ids, tb_user_task_batt_test.BattGroupId, task_enabled, task_exe_date, task_close_date, task_notice_starttime, task_notice_endtime, task_notice_count, task_notice_latesttime, task_notice_master, test_complete, test_completetime, test_starttime, test_record_count_id, note, stationname, battgroupname from db_user.tb_user_task_batt_test, db_battinf.tb_battinf where tb_user_task_batt_test.battgroupid = db_battinf.tb_battinf.battgroupid and task_id = #{task_id} order by task_id </select> <select id="serchByInfo" resultType="java.util.List"></select> </mapper> src/main/resources/mapper/UserTaskMapper.xml
@@ -1,7 +1,56 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.fgkj.mapper.impl.User_taskMapper" > <resultMap id="BaseResultMap" type="Task_Batt_Test"> <association property="utask" javaType="User_task"> <result column="num" property="num"></result> <result column="task_id" property="task_id"></result> <result column="task_id_ex" property="task_id_ex"></result> <result column="task_type" property="task_type"></result> <result column="task_name" property="task_name"></result> <result column="task_enabled" property="task_enabled"></result> <result column="task_create_date" property="task_create_date"></result> <result column="task_start_date" property="task_start_date"></result> <result column="task_close_date" property="task_close_date"></result> <result column="subtask_count" property="subtask_count"></result> <result column="task_notice_sum" property="task_notice_sum"></result> <result column="task_notice_starttime" property="task_notice_starttime"></result> <result column="task_notice_endtime" property="task_notice_endtime"></result> <result column="task_notice_timeinterval" property="task_notice_timeinterval"></result> <result column="task_notice_count" property="task_notice_count"></result> <result column="task_notice_latesttime" property="task_notice_latesttime"></result> <result column="task_autoinc_day_count" property="task_autoinc_day_count"></result> <result column="task_delay_day_count" property="task_delay_day_count"></result> <result column="task_pass_saturday" property="task_pass_saturday"></result> <result column="task_pass_sunday" property="task_pass_sunday"></result> <result column="task_pass_jiejiari" property="task_pass_jiejiari"></result> <result column="task_confirm" property="task_confirm"></result> <result column="task_confirm_date" property="task_confirm_date"></result> <result column="task_complete" property="task_complete"></result> <result column="task_complete_date" property="task_complete_date"></result> <result column="task_complete_confirm" property="task_complete_confirm"></result> <result column="task_complete_confirm_date" property="task_complete_confirm_date"></result> <result column="notice_master_enabled" property="notice_master_enabled"></result> <result column="notice_master" property="notice_master"></result> <result column="note" property="note"></result> </association> <association property="utest" javaType="User_task_batt_test"> <result column="task_id1" property="task_id"></result> <result column="task_usr_ids1" property="task_usr_ids"></result> <result column="battgroupid1" property="battGroupId"></result> <result column="task_exe_date1" property="task_exe_date1"></result> <result column="task_close_date1" property="task_close_date"></result> </association> <association property="ucheck" javaType="User_task_batt_check"> <result column="task_id2" property="task_id"></result> <result column="task_usr_ids2" property="task_usr_ids"></result> <result column="battgroupid2" property="battGroupId"></result> <result column="task_exe_date2" property="task_exe_date"></result> <result column="task_close_date2" property="task_close_date"></result> </association> <association property="binf" javaType="BattInf"></association> <association property="pageBean" javaType="Page"></association> </resultMap> <!-- public List getResults(ResultSet rs) { List list=new ArrayList(); @@ -726,12 +775,56 @@ <insert id="add"></insert> <insert id="addPro"></insert> <update id="update"></update> <!-- <update id="update"></update>--> <update id="updatePro"></update> <delete id="del"></delete> <!-- <delete id="del">--> <!-- <if test="task_type!=2">--> <!-- delete from db_user.tb_user_task where task_id=#{task_id};--> <!-- delete from db_user.tb_user_task_batt_test where task_id=#{task_id};--> <!-- </if>--> <!-- <if test="task_type==2">--> <!-- delete from db_user.tb_user_task where task_id=#{task_id};--> <!-- delete from db_user.tb_user_task_batt_check where task_id=#{task_id};--> <!-- </if>--> <!-- </delete>--> <select id="searchAll" resultType="java.util.List"></select> <select id="serchByCondition" resultType="java.util.List"></select> <select id="serchByInfo" resultType="java.util.List"></select> <select id="serchByInfo" resultMap="BaseResultMap"> select distinct(db_user.tb_user_task.task_id),tb_user_task.num,task_id_ex,task_name,task_type,tb_user_task.task_enabled,task_create_date,task_start_date,tb_user_task.task_close_date,subtask_count,task_notice_sum,tb_user_task.task_notice_starttime,tb_user_task.task_notice_endtime,task_notice_timeinterval,tb_user_task.task_notice_count,tb_user_task.task_notice_latesttime,task_autoinc_day_count,task_delay_day_count,task_pass_saturday,task_pass_sunday,task_pass_jiejiari,task_confirm,task_confirm_date,task_complete,task_complete_date,task_complete_confirm,task_complete_confirm_date,notice_master_enabled,notice_master,tb_user_task.note,db_user.tb_user_task_batt_test.task_id as task_id1,db_user.tb_user_task_batt_test.task_usr_ids as task_usr_ids1,db_user.tb_user_task_batt_test.battgroupid as battgroupid1,db_user.tb_user_task_batt_test.task_exe_date as task_exe_date1,db_user.tb_user_task_batt_test.task_close_date as task_close_date1 ,db_user.tb_user_task_batt_check.task_id as task_id2,db_user.tb_user_task_batt_check.task_usr_ids as task_usr_ids2,db_user.tb_user_task_batt_check.battgroupid as battgroupid2,db_user.tb_user_task_batt_check.task_exe_date as task_exe_date2,db_user.tb_user_task_batt_check.task_close_date as task_close_date2 from db_user.tb_user_task left outer join db_user.tb_user_task_batt_test on db_user.tb_user_task.task_id=db_user.tb_user_task_batt_test.task_id left outer join db_user.tb_user_task_batt_check on db_user.tb_user_task.task_id=db_user.tb_user_task_batt_check.task_id where (db_user.tb_user_task_batt_test.task_usr_ids like '%${uinf.uId}%' or db_user.tb_user_task_batt_check.task_usr_ids like '%${uinf.uId}%') and to_days(tb_user_task.task_close_date)>=to_days(#{utask.task_close_date}) and to_days(tb_user_task.task_close_date) <![CDATA[<=]]> to_days(#{utask.task_close_date1}) <if test="utask.task_type==10"> and task_type in(#{utask.task_close_date},0,1) </if> <if test="utask.task_type==2"> and task_type=#{utask.task_close_date} </if> <if test="utask.task_type==3"> and task_type=#{utask.task_close_date} </if> <if test="utask.task_type==100"> and task_type!=#{utask.task_close_date} </if> <if test="utask.task_complete==100"> and task_complete!=#{utask.task_complete} </if> <if test="utask.task_complete!=100"> and task_complete=#{utask.task_complete} </if> order by task_start_date desc </select> <select id="serchByTask" resultType="java.util.List"></select> <select id="serchMaxId" resultType="java.util.List"></select> </mapper>
