|
@@ -7,14 +7,15 @@ import java.io.FileInputStream;
|
|
|
import java.io.FileOutputStream;
|
|
import java.io.FileOutputStream;
|
|
|
import java.io.InputStream;
|
|
import java.io.InputStream;
|
|
|
import java.io.OutputStream;
|
|
import java.io.OutputStream;
|
|
|
-import java.util.Date;
|
|
|
|
|
-import java.util.HashMap;
|
|
|
|
|
-import java.util.List;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
|
|
+import com.xintong.visualinspection.bean.FeeStation;
|
|
|
|
|
+import com.xintong.visualinspection.bean.Organ;
|
|
|
|
|
+import com.xintong.visualinspection.dao.cluster.DepartmentDao;
|
|
|
|
|
+import com.xintong.visualinspection.pojo.OtherCheckStatistics;
|
|
|
import org.jxls.common.Context;
|
|
import org.jxls.common.Context;
|
|
|
import org.jxls.util.JxlsHelper;
|
|
import org.jxls.util.JxlsHelper;
|
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -40,6 +41,10 @@ public class CheckOtherServiceImpl extends BaseService implements CheckOtherSer
|
|
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private CheckOtherDao checkOtherDao;
|
|
private CheckOtherDao checkOtherDao;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private DepartmentDao departmentDao;
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public void insert(CheckOther checkOther) {
|
|
public void insert(CheckOther checkOther) {
|
|
|
checkOtherDao.insert(checkOther);
|
|
checkOtherDao.insert(checkOther);
|
|
@@ -140,5 +145,42 @@ public class CheckOtherServiceImpl extends BaseService implements CheckOtherSer
|
|
|
public void update(CheckOther checkOther) {
|
|
public void update(CheckOther checkOther) {
|
|
|
checkOtherDao.update(checkOther);
|
|
checkOtherDao.update(checkOther);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public Map<String,Object> getOtherCheckStatistics(String checktime, int checktype) {
|
|
|
|
|
+
|
|
|
|
|
+ Map<String,Object> datas = new HashMap<>();
|
|
|
|
|
+
|
|
|
|
|
+ List<OtherCheckStatistics> otherCheckStatistics = new ArrayList<>();
|
|
|
|
|
+
|
|
|
|
|
+ List<FeeStation> liststation = departmentDao.getAllFS();
|
|
|
|
|
+ List<FeeStation> list = departmentDao.getAllRM();
|
|
|
|
|
+ if(checktype==1){
|
|
|
|
|
+ for (FeeStation station:liststation
|
|
|
|
|
+ ) {
|
|
|
|
|
+ OtherCheckStatistics otherCheckStatistics1 = new OtherCheckStatistics();
|
|
|
|
|
+ otherCheckStatistics1.setDeptid(station.getDeptid());
|
|
|
|
|
+ otherCheckStatistics1.setDeptname(station.getName().replaceAll("收费站",""));
|
|
|
|
|
+ otherCheckStatistics1.setPdeptid(station.getParentid());
|
|
|
|
|
+// otherCheckStatistics1.setPdeptname(pstation.getName());
|
|
|
|
|
+ otherCheckStatistics.add(otherCheckStatistics1);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ for (FeeStation a:list
|
|
|
|
|
+ ) {
|
|
|
|
|
+ List<OtherCheckStatistics> s=new ArrayList<>();
|
|
|
|
|
+ for (OtherCheckStatistics o:otherCheckStatistics
|
|
|
|
|
+ ) {
|
|
|
|
|
+ if(o.getPdeptid().equals(a.getDeptid())){
|
|
|
|
|
+ o.setPdeptname(a.getName());
|
|
|
|
|
+ s.add(o);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ datas.put(a.getName().replaceAll("道管中心",""),s);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return datas;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|