Skip to content

Y
YX_IDENT_REFACTORING
Commit 9bf5fff5 authored by Administrator's avatar Administrator
Browse files
Options

Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_REFACTORING into dev 

# Conflicts:
#	src/main/resources/static/tpl/layout/permissionList/permissionList.html
#	src/main/resources/static/tpl/layout/permissionList/permissionList.js
#	src/main/resources/static/tpl/layout/userList/userList.js
parents 26c02f41 ecddba2d
Hide whitespace changes
Inline Side-by-side
Showing with 4987 additions and 1140 deletions
pom.xml
View file @ 9bf5fff5
...@@ -88,8 +88,12 @@ ...@@ -88,8 +88,12 @@
<artifactId>poi</artifactId> <artifactId>poi</artifactId>
<version>3.13</version> <version>3.13</version>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</dependency>
<!-- MyBatis分页插件 --> <!-- MyBatis分页插件 -->
<!--<dependency>--> <!--<dependency>-->
<!--<groupId>com.github.pagehelper</groupId>--> <!--<groupId>com.github.pagehelper</groupId>-->
<!--<artifactId>pagehelper</artifactId>--> <!--<artifactId>pagehelper</artifactId>-->
......
src/countyList.xml 0 → 100644
View file @ 9bf5fff5
<?xml version="1.0" encoding="UTF-8"?>
<countyLists>
<countyList county_List_Id="imooc-001" task_Id="20181204">
<saveDate>2018-12-04</saveDate>
<countyCode>413200</countyCode>
<finishCount>1030</finishCount>
<inStorageCount>1030</inStorageCount>
<outStorageCount>1030</outStorageCount>
</countyList>
<countyList county_List_Id="imooc-002" task_Id="20181205">
<saveDate>2018-12-05</saveDate>
<countyCode>413200</countyCode>
<finishCount>1030</finishCount>
<inStorageCount>1030</inStorageCount>
<outStorageCount>1030</outStorageCount>
</countyList>
</countyLists>
src/log4j.properties 0 → 100644
View file @ 9bf5fff5
log4j.rootCategory=DEBUG,stdout,DebugAppender,InfoAppender,ErrorAppender
log4j.debug=true
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[QC] %p [%t] %C.%M(%L) | %m%n
#logger input file
log4j.logger.DebugAppender.access=DEBUG
log4j.appender.DebugAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.DebugAppender.File=../logs/a.log
log4j.appender.DebugAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.DebugAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#logger input file
log4j.logger.InfoAppender.access=INFO
log4j.appender.InfoAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.InfoAppender.File=../logs/b.log
log4j.appender.InfoAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.InfoAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#error log input file
log4j.logger.ErrorAppender.access=ERROR
log4j.appender.ErrorAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.ErrorAppender.File=../logs/c.log
log4j.appender.ErrorAppender.Append = true
log4j.appender.ErrorAppender.threshold = ERROR
log4j.appender.ErrorAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.ErrorAppender.layout.ConversionPattern=%d{MM-dd HH:mm:ss.SSS} %c %-5p - %m%n
\ No newline at end of file
src/main/java/com/yxproject/start/api/UserApi.java
View file @ 9bf5fff5
...@@ -14,11 +14,18 @@ import org.apache.shiro.authc.UnknownAccountException; ...@@ -14,11 +14,18 @@ import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.Subject;
import org.dom4j.*;
import org.dom4j.Attribute;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.*;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
...@@ -40,6 +47,23 @@ public class UserApi { ...@@ -40,6 +47,23 @@ public class UserApi {
private CountyListService countyListService; private CountyListService countyListService;
@Autowired @Autowired
private CardBodyService cardBodyService; private CardBodyService cardBodyService;
@Autowired
private GroupListService groupListService;
@Autowired
private CityListService cityListService;
@Autowired
private CountyService countyService;
@Autowired
private TypeListService typeListService;
@Autowired
private ReceiptListService receiptListService;
// @Autowired
// private ReadCountyListXMLService readCountyListXMLService;
// @Autowired
// private PrintCountyListXMLService printCountyListXMLService;
// @Autowired
// private static Dom4JCRUD dom4JCRUD;
@PostMapping("login") @PostMapping("login")
public Map<String, Object> submitLogin(@RequestBody String jsonStr) { public Map<String, Object> submitLogin(@RequestBody String jsonStr) {
...@@ -108,7 +132,7 @@ public class UserApi { ...@@ -108,7 +132,7 @@ public class UserApi {
public String updateProductionTask(@RequestParam("id") String id, HttpServletResponse resp) { public String updateProductionTask(@RequestParam("id") String id, HttpServletResponse resp) {
String map = "{\"production_Task_List_Id\":\"20181016001\",\"make_Type\":8,\"old_Make_Type\":8,} "; String map = "{\"production_Task_List_Id\":\"20181016001\",\"make_Type\":8,\"old_Make_Type\":8,} ";
JSONObject jsonObject = JSONObject.fromObject(map); JSONObject jsonObject = JSONObject.fromObject(map);
TaskEntity productionTaskListEntity = (TaskEntity) jsonObject.toBean(jsonObject, TaskEntity.class); TaskEntity productionTaskListEntity = (TaskEntity) JSONObject.toBean(jsonObject, TaskEntity.class);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
int i = taskService.updateProductionTask(productionTaskListEntity); int i = taskService.updateProductionTask(productionTaskListEntity);
...@@ -317,81 +341,15 @@ public class UserApi { ...@@ -317,81 +341,15 @@ public class UserApi {
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/**
* 下载装箱单
*/
@RequestMapping("printPackingList")
// @RequiresPermissions("userInfo.add")//权限管理;
public byte[] printPackingList(@RequestParam("cyclesheetID") String taskID, HttpServletResponse response) {
// cyclesheetID ="20180802032";
response.setContentType("application/x-download");
response.setCharacterEncoding("UTF-8");
String dateTime = DateFormatUtils.format(new Date(), "yyyyMMddHH");
// //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
String fout = null;
List<Map<String, Object>> countyInfoList = groupNoService.findCountyInfoList(taskID);
List<TaskEntity> taskEntities = taskService.findProductionTaskListEntityByID(Long.valueOf(taskID));
fout = exportExcel(countyInfoList, taskEntities.get(0).getCard_Type() + "", "p1", 6000, taskEntities.get(0).getCitycode(), dateTime, taskID);
String outFile = dateTime + taskEntities.get(0).getCitycode() + "二代身份证统计表";
try {
FileInputStream fis = new FileInputStream(new File(fout));
byte[] b = new byte[fis.available()];
fis.read(b);
fis.close();
response.addHeader("Content-Disposition", "attachment;filename=" + outFile + ".xls");
return b;
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
/** /**
* 通过任务单查询区县列表; * 通过任务单查询区县列表;
* *
* @return * @return
*/ */
@RequestMapping("getCountyListByTaskListId") @RequestMapping("getCountyList")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getCountyListInfoByTaskListID(@RequestParam("taskListID") String tasklistid, HttpServletResponse resp) {
List<CountyListEntity> countyListEntity = countyListService.findCountyListByTaskListID(tasklistid);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(countyListEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 通过状态查询区县列表;
*
* @returns
*/
@RequestMapping("getCountyListByTaskStateId")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String findCountyListByTaskStateId(@RequestParam("taskStateId") String TaskStateId, HttpServletResponse resp) { public String getCountyListInfoByTaskListID(@RequestParam("taskListId") String taskListId,@RequestParam("taskStateId") String taskStateId,@RequestParam("cardType") String cardType, HttpServletResponse resp) {
List<CountyListEntity> countyListEntity = countyListService.findCountyListByTaskStateId(TaskStateId); List<CountyEntity> countyListEntity = countyService.findCountyList(taskListId,taskStateId,cardType);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(countyListEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 通过制证类型查询区县列表;
*
* @returns
*/
@RequestMapping("getCountyListByCardType")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getCountyListByCardType(@RequestParam("cardType") String cardType, HttpServletResponse resp) {
List<CountyListEntity> countyListEntity = countyListService.findCountyListByCardType(cardType);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(countyListEntity); yxjsonResponse.outPutSuccess(countyListEntity);
...@@ -405,27 +363,10 @@ public class UserApi { ...@@ -405,27 +363,10 @@ public class UserApi {
* *
* @return * @return
*/ */
@RequestMapping("getGroupNoByTaskListId") @RequestMapping("getGroupListByTaskListId")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getGroupNoByTaskListId(@RequestParam("taskListID") String tasklistid, HttpServletResponse resp) {
List<GroupNoEntity> groupNoEntity = groupNoService.findGroupNoByTaskListID(tasklistid);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(groupNoEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 通过状态查询组列表;
*
* @returns
*/
@RequestMapping("getGroupNoByTaskStateId")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String findGroupNoByTaskStateId(@RequestParam("taskStateId") String taskStateId, HttpServletResponse resp) { public String getGroupListByTaskListId(@RequestParam("taskListId") String taskListId, HttpServletResponse resp) {
List<GroupNoEntity> groupNoEntity = groupNoService.findGroupNoByTaskStateId(taskStateId); List<GroupListEntity> groupNoEntity = groupListService.findGroupListByTaskListId(taskListId);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(groupNoEntity); yxjsonResponse.outPutSuccess(groupNoEntity);
...@@ -434,22 +375,6 @@ public class UserApi { ...@@ -434,22 +375,6 @@ public class UserApi {
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/**
* 通过制证类型查询组列表;
*
* @returns
*/
@RequestMapping("getGroupNoByCardType")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getGroupNoByCardType(@RequestParam("cardType") String cardType, HttpServletResponse resp) {
List<GroupNoEntity> groupNoEntity = groupNoService.findGroupNoByCardType(cardType);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(groupNoEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/** /**
* 查询TypeList通过状态; * 查询TypeList通过状态;
...@@ -459,10 +384,10 @@ public class UserApi { ...@@ -459,10 +384,10 @@ public class UserApi {
@RequestMapping("getTypeListByTaskStateId") @RequestMapping("getTypeListByTaskStateId")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String getTypeListByTaskStateId(@RequestParam("taskStateId") String taskStateId, HttpServletResponse resp) { public String getTypeListByTaskStateId(@RequestParam("taskStateId") String taskStateId, HttpServletResponse resp) {
List <Map <String, Object>> taskEntity = taskService.findTypeListByTaskStateId(taskStateId); List<TypeListEntity> typeListEntity = typeListService.findTypeListByTaskStateId(taskStateId);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(taskEntity); yxjsonResponse.outPutSuccess(typeListEntity);
Map map = new HashMap(); Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity); // map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
...@@ -473,34 +398,18 @@ public class UserApi { ...@@ -473,34 +398,18 @@ public class UserApi {
* *
* @return * @return
*/ */
@RequestMapping("getCityListByTaskStateId") @RequestMapping("getCityList")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String getCityListByTaskStateId(@RequestParam("taskStateId") String taskStateId, HttpServletResponse resp) { public String getCityListByTaskStateId(@RequestParam("taskStateId") String taskStateId,@RequestParam("cardType") String cardType, HttpServletResponse resp) {
List <Map <String, Object>> taskEntity = taskService.findCityListByTaskStateId(taskStateId); List <CityListEntity> cityListEntity = cityListService.findCityList(taskStateId,cardType);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(taskEntity); yxjsonResponse.outPutSuccess(cityListEntity);
Map map = new HashMap(); Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity); // map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/**
* 查询CityList通过制证类型;
*
* @return
*/
@RequestMapping("getCityListByCardType")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getCityListByCardType(@RequestParam("cardType") String cardType, HttpServletResponse resp) {
List <Map <String, Object>> taskEntity = taskService.findCityListByCardType(cardType);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(taskEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/** /**
* 查询派出所申领表通过保存时间; * 查询派出所申领表通过保存时间;
...@@ -509,8 +418,8 @@ public class UserApi { ...@@ -509,8 +418,8 @@ public class UserApi {
*/ */
@RequestMapping("getPoliceStationApplyReasonBySaveDate") @RequestMapping("getPoliceStationApplyReasonBySaveDate")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String getPoliceStationApplyReasonBySaveDate(@RequestParam("saveDate") String saveDate, HttpServletResponse resp) { public String getPoliceStationApplyReasonBySaveDate(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, HttpServletResponse resp) {
List <Map <String, Object>> policeStationApplyReasonEntity = policeStationApplyReasonService.findPoliceStationApplyReasonBySaveDate(saveDate); List <Map <String, Object>> policeStationApplyReasonEntity = policeStationApplyReasonService.findPoliceStationApplyReasonBySaveDate(startDate,endDate);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(policeStationApplyReasonEntity); yxjsonResponse.outPutSuccess(policeStationApplyReasonEntity);
...@@ -553,6 +462,23 @@ public class UserApi { ...@@ -553,6 +462,23 @@ public class UserApi {
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/**
* 查询出入库数据;
*
* @return
*/
@RequestMapping("getStorageCountByTaskListId")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getStorageCountByTaskListId(@RequestParam("taskListID") String taskListId, HttpServletResponse resp) {
List <CountyListEntity> countyListEntity=countyListService.findStorageCountByTaskListId(taskListId);
YXJSONResponse yxjsonResponse=new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(countyListEntity);
Map map=new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
/** /**
* 查询卡基表; * 查询卡基表;
* *
...@@ -579,7 +505,7 @@ public class UserApi { ...@@ -579,7 +505,7 @@ public class UserApi {
public String addExceptionState(@RequestParam("exception_Information") String exception_Information, HttpServletResponse resp) { public String addExceptionState(@RequestParam("exception_Information") String exception_Information, HttpServletResponse resp) {
String map = "{\"task_Id\":\"20181016001\",\"exception_Information\":0} "; String map = "{\"task_Id\":\"20181016001\",\"exception_Information\":0} ";
JSONObject jsonObject = JSONObject.fromObject(map); JSONObject jsonObject = JSONObject.fromObject(map);
TaskEntity taskEntity = (TaskEntity) jsonObject.toBean(jsonObject, TaskEntity.class); TaskEntity taskEntity = (TaskEntity) JSONObject.toBean(jsonObject, TaskEntity.class);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
int i = taskService.addExceptionState(taskEntity); int i = taskService.addExceptionState(taskEntity);
...@@ -588,118 +514,118 @@ public class UserApi { ...@@ -588,118 +514,118 @@ public class UserApi {
} }
/** /**
* 更新入库时间 * 对出入库数进行更改
* 修改方法,在sql里面对合计值与出库数进行判断 *
* @return
*/
@RequestMapping("updateInStorageDate")
// @RequiresPermissions("userInfo.add")//权限管理;
public String updateInStorageDate(@RequestParam("id") String id, HttpServletResponse resp) {
String map = "{\"id\":\"20181016001\",} ";
JSONObject jsonObject = JSONObject.fromObject(map);
Object inStorageCount = jsonObject.get("inStorageCount");
Object inStorageDate = jsonObject.get("inStorageDate");
TaskEntity taskEntity = (TaskEntity) inStorageDate;
CountyListEntity countyListEntity = (CountyListEntity) inStorageCount;
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
int i = taskService.updateInStorageDate(taskEntity,countyListEntity);
yxjsonResponse.outPutSuccess(i + "更新成功");
return yxjsonResponse.toJSONString();
}
/**
* 更新出库时间
* @return * @return
*/ */
@RequestMapping("updateOutBoundDate") @RequestMapping("reviseBoundCount")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String updateOutBoundDate(@RequestParam("id") String id, HttpServletResponse resp) { public String reviseBoundCount(@RequestParam("countyListId") String countyListId,@RequestParam("outStorageCount") String out_Storage_Count,@RequestParam("inStorageCount") String in_Storage_Count, HttpServletResponse resp) {
String map = "{\"id\":\"20181016001\",} "; int i=countyListService.reviseBoundCount(countyListId, out_Storage_Count, in_Storage_Count);
JSONObject jsonObject = JSONObject.fromObject(map);
Object outStorageCount = jsonObject.get("outStorageCount");
Object putOutStorageDate = jsonObject.get("putOutStorageDate");
TaskEntity taskEntity = (TaskEntity) putOutStorageDate;
CountyListEntity countyListEntity = (CountyListEntity) outStorageCount;
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
int i = taskService.updateOutBoundDate(taskEntity,countyListEntity); yxjsonResponse.outPutSuccess(i+"--更新成功--");
yxjsonResponse.outPutSuccess(i + "更新成功");
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/** /**
* 对出库数进行更改 * 更新入库时间
* 更新出库数 * 前端空值
* @return * @return
*/ */
@RequestMapping("reviseOutBoundCount") @RequestMapping("updateInStorageDate")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String reviseOutBoundCount(@RequestParam("county_List_Id") String county_List_Id, HttpServletResponse resp) { public String updateInStorageDate(@RequestParam("taskListId") String taskListId,@RequestParam("inStorageCount") String inStorageCount,@RequestParam("outStorageCount") String outStorageCount, HttpServletResponse resp) {
String map = "{\"county_List_Id\":\"20181016001\",\"Out_Storage_County\":\"52\",} "; int i = taskService.updateStorageDate(taskListId,inStorageCount,outStorageCount);
JSONObject jsonObject = JSONObject.fromObject(map);
CountyListEntity countyListEntity = (CountyListEntity) jsonObject.toBean(jsonObject, CountyListEntity.class);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
int i = countyListService.reviseOutBoundCount(countyListEntity);
yxjsonResponse.outPutSuccess(i + "更新成功"); yxjsonResponse.outPutSuccess(i + "更新成功");
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/** // /**
* 对入库数进行更改 // * 更新出库时间
* 更新入库数 // * @return
* @return // */
*/ // @RequestMapping("updateOutBoundDate")
@RequestMapping("reviseInBoundCount") //// @RequiresPermissions("userInfo.add")//权限管理;
// @RequiresPermissions("userInfo.add")//权限管理; // public String updateOutBoundDate(@RequestParam("id") String id, HttpServletResponse resp) {
public String reviseInBoundCount(@RequestParam("county_List_Id") String county_List_Id, HttpServletResponse resp) { // String map = "{\"id\":\"20181016001\",} ";
String map = "{\"county_List_Id\":\"20181016001\",\"In_Storage_County\":\"52\",} "; // JSONObject jsonObject = JSONObject.fromObject(map);
JSONObject jsonObject = JSONObject.fromObject(map); // Object outStorageCount = jsonObject.get("outStorageCount");
CountyListEntity countyListEntity = (CountyListEntity) jsonObject.toBean(jsonObject, CountyListEntity.class); // Object putOutStorageDate = jsonObject.get("putOutStorageDate");
YXJSONResponse yxjsonResponse = new YXJSONResponse(); // TaskEntity taskEntity = (TaskEntity) putOutStorageDate;
resp.setCharacterEncoding("UTF-8"); // CountyListEntity countyListEntity = (CountyListEntity) outStorageCount;
int i = countyListService.reviseInBoundCount(countyListEntity); // YXJSONResponse yxjsonResponse = new YXJSONResponse();
yxjsonResponse.outPutSuccess(i + "更新成功"); // resp.setCharacterEncoding("UTF-8");
return yxjsonResponse.toJSONString(); // int i = taskService.updateOutBoundDate(taskEntity,countyListEntity);
} // yxjsonResponse.outPutSuccess(i + "更新成功");
// return yxjsonResponse.toJSONString();
// }
/** /**
* 查询交接单; * 查询交接单;
* *
* @return * @return
*/ */
@RequestMapping("getConnectList") @RequestMapping("getReceiptList")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String getConnectList(@RequestParam("save_Date") String save_Date, HttpServletResponse resp) { public String getReceiptList(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, HttpServletResponse resp) {
List <Map <String, Object>> countyListEntity = countyListService.getConnectList(save_Date); List<ReceiptListEntity> receiptListEntity = receiptListService.getReceiptList(startDate,endDate);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(countyListEntity); yxjsonResponse.outPutSuccess(receiptListEntity);
Map map = new HashMap(); Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity); // map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/**
* 下载装箱单
*/
@RequestMapping("printPackingList")
// @RequiresPermissions("userInfo.add")//权限管理;
public byte[] printPackingList(@RequestParam("cyclesheetID") String taskID, HttpServletResponse response) {
// cyclesheetID ="20180802032";
response.setContentType("application/x-download");
response.setCharacterEncoding("UTF-8");
String dateTime = DateFormatUtils.format(new Date(), "yyyyMMddHH");
// //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
String fout = null;
List<Map<String, Object>> countyInfoList = groupNoService.findCountyInfoList(taskID);
List<TaskEntity> taskEntities = taskService.findProductionTaskListEntityByID(Long.valueOf(taskID));
fout = exportExcel(countyInfoList, taskEntities.get(0).getCard_Type() + "", "p1", 6000, taskEntities.get(0).getCitycode(), dateTime, taskID);
String outFile = dateTime + taskEntities.get(0).getCitycode() + "二代身份证统计表";
try {
FileInputStream fis = new FileInputStream(new File(fout));
byte[] b = new byte[fis.available()];
fis.read(b);
fis.close();
response.addHeader("Content-Disposition", "attachment;filename=" + outFile + ".xls");
return b;
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
// /** // /**
// * 下载交接单; // * 下载交接单
// *
// * @return
// */ // */
// @RequestMapping("printConnectList") // @RequestMapping("printConnectList")
//// @RequiresPermissions("userInfo.add")//权限管理; //// @RequiresPermissions("userInfo.add")//权限管理;
// public byte[] printConnectList(@RequestParam("save_Date") String save_Date, HttpServletResponse response) { // public byte[] printConnectList(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, HttpServletResponse response) {
//// cyclesheetID ="20180802032"; //// cyclesheetID ="20180802032";
// response.setContentType("application/x-download"); // response.setContentType("application/x-download");
// response.setCharacterEncoding("UTF-8"); // response.setCharacterEncoding("UTF-8");
// String dateTime = DateFormatUtils.format(new Date(), "yyyyMMddHH"); // String dateTime = DateFormatUtils.format(new Date(), "yyyyMMddHH");
//// //使用Servlet实现文件下载的时候，避免浏览器自动打开文件 //// //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
// String fout = null; // String fout = null;
// List <Map <String, Object>> countyListEntity = countyListService.getConnectList(save_Date); // List<ReceiptListEntity> receiptListEntity = receiptListService.getReceiptList(startDate,endDate);
// List<TaskEntity> taskEntities = taskService.findProductionTaskListEntityByID(Long.valueOf(save_Date)); // fout = receiptListExcel(receiptListEntity, receiptListEntity.get(0).getXiaoJi() + "", 6000, receiptListEntity.get(0).getBoxCount(), dateTime, startDate, endDate);
// fout = exportExcel(countyListEntity, taskEntities.get(0).getCard_Type() + "", "p1", 6000, taskEntities.get(0).getCitycode(), dateTime, save_Date); // String outFile = dateTime + "二代身份证交接单";
// String outFile = dateTime + taskEntities.get(0).getCitycode() + "二代身份证交接单";
// try { // try {
// FileInputStream fis = new FileInputStream(new File(fout)); // FileInputStream fis = new FileInputStream(new File(fout));
// byte[] b = new byte[fis.available()]; // byte[] b = new byte[fis.available()];
...@@ -714,7 +640,199 @@ public class UserApi { ...@@ -714,7 +640,199 @@ public class UserApi {
// } // }
// return null; // return null;
// } // }
//
// /**
// * 下载交接单
// *
// * @param receiptListEntity 交接单信息
// * @param typeName 制证类型
// * @param sum 总数
// * @param boxCount 区县代码
// * @param countyName 区县名称
// */
// private String receiptListExcel( List<ReceiptListEntity> receiptListEntity, String typeName, int sum, String boxCount, String dateTime, String startDate ,String endDate) {
// if (typeName.contains("null")) {
// typeName = typeName.replace("null", "");
// }
// //第一步创建workbook
// HSSFWorkbook wb = new HSSFWorkbook();
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
// HSSFSheet sheet = wb.createSheet("二代身份证交接单");
// sheet.setColumnWidth(0, 30 * 100);
// sheet.setColumnWidth(1, 30 * 70);
// sheet.setColumnWidth(2, 30 * 80);
// sheet.setColumnWidth(3, 30 * 50);
// sheet.setColumnWidth(4, 30 * 110);
//
// HSSFPrintSetup ps = sheet.getPrintSetup();
// ps.setLandscape(true); // 打印方向，true：横向，false：纵向
// ps.setPaperSize(HSSFPrintSetup.B5_PAPERSIZE); //纸张
// sheet.setColumnWidth(0, (int) 35.7 * 100);
// //第三步创建行row:添加表头0行
// HSSFRow row = sheet.createRow(0);
// HSSFCellStyle style = wb.createCellStyle();//样式
//
// style.setVerticalAlignment(HSSFCellStyle.ALIGN_LEFT); //设置垂直居中
// style.setAlignment(HSSFCellStyle.ALIGN_LEFT);
// style.setWrapText(true);//设置自动换行
//
// style.setBorderBottom(HSSFCellStyle.BORDER_THIN); //下边框
// style.setBorderLeft(HSSFCellStyle.BORDER_THIN);//左边框
// style.setBorderTop(HSSFCellStyle.BORDER_THIN);//上边框
// style.setBorderRight(HSSFCellStyle.BORDER_THIN);//右边框
//
// HSSFFont font = wb.createFont();
// font.setFontHeightInPoints((short) 12);
// style.setFont(font);
// HSSFCellStyle style2 = wb.createCellStyle(); //表头样式
//
// style2.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER); //设置垂直居中
// style2.setAlignment(HSSFCellStyle.ALIGN_CENTER);
//
// HSSFFont font2 = wb.createFont();
// font2.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);//粗体显示
// font2.setFontHeightInPoints((short) 14);
// style2.setFont(font2);
//
// row = sheet.createRow(0); //创建下标为0的单元格
// row.setHeightInPoints(Short.parseShort("20"));//设置行高
// HSSFCell cell = row.createCell(0); //设定值
// cell.setCellValue("二代身份证交接单");
// cell.setCellStyle(style2);
// for (int i = 0; i < 12; i++) {
// cell = row.createCell(i + 1);
// cell.setCellValue("");
// cell.setCellStyle(style2);
// }
// CellRangeAddress callRangeAddress = new CellRangeAddress(0, 0, 0, 12);//起始行,结束行,起始列,结束列
// sheet.addMergedRegion(callRangeAddress);
//
// row = sheet.createRow(1);
// row.setHeightInPoints(Short.parseShort("16"));//设置行高
//
// cell = row.createCell(0);
// cell.setCellValue("区县"); //设定值
// cell.setCellStyle(style); //内容居中
//
// cell = row.createCell(1); //第二个单元格
// cell.setCellValue("普通证");
// cell.setCellStyle(style);
//
// cell = row.createCell(2); //第三个单元格
// cell.setCellValue("快证");
// cell.setCellStyle(style);
//
// cell = row.createCell(3); //第四个单元格
// cell.setCellValue("省内异地快速通道邮");
// cell.setCellStyle(style);
//
// cell = row.createCell(4); //第五个单元格
// cell.setCellValue("省内异地快速通道普");
// cell.setCellStyle(style);
//
// cell = row.createCell(5); //第六个单元格
// cell.setCellValue("省内异地邮");
// cell.setCellStyle(style);
//
// cell = row.createCell(6); //第七个单元格
// cell.setCellValue("省内异地普");
// cell.setCellStyle(style);
//
// cell = row.createCell(7); //第八个单元格
// cell.setCellValue("军人证");
// cell.setCellStyle(style);
//
// cell = row.createCell(8); //第九个单元格
// cell.setCellValue("快速通道普");
// cell.setCellStyle(style);
//
// cell = row.createCell(9); //第十个单元格
// cell.setCellValue("快速通道邮");
// cell.setCellStyle(style);
//
// cell = row.createCell(10); //第十一个单元格
// cell.setCellValue("邮寄证");
// cell.setCellStyle(style);
//
// cell = row.createCell(11); //第十二个单元格
// cell.setCellValue("小计");
// cell.setCellStyle(style);
//
// cell = row.createCell(12); //第十三个单元格
// cell.setCellValue("盒数");
// cell.setCellStyle(style);
//
// row = sheet.createRow(2);//i+2行之后开始创建
// row.setHeightInPoints(Short.parseShort("16"));//设置行高
// //创建单元格并且添加数据
// cell = row.createCell(0);
// cell.setCellValue(countyCode);
// cell.setCellStyle(style);
// for (int i = 0; i < 12; i++) {
// cell = row.createCell(i + 1);
// cell.setCellValue("");
// cell.setCellStyle(style);
// }
//
// //第五步插入数据
// int num = 0;
// for (int i = 0; i < countyListEntity.size(); i++) {
// Map<String, Object> map =(Map <String, Object>) countyListEntity.get(i);
// //创建行
// row = sheet.createRow(i + 3);//i+2行之后开始创建
// row.setHeightInPoints(Short.parseShort("16"));//设置行高
// //创建单元格并且添加数据
// cell = row.createCell(0);
// cell.setCellValue((String) map.get("COUNTYNAME"));
// cell.setCellStyle(style);
//
// cell = row.createCell(1);
// cell.setCellValue(map.get("DOWNLOAD").toString().equals("0") ? "" : map.get("DOWNLOAD").toString());
// cell.setCellStyle(style);
//
// cell = row.createCell(2);
// cell.setCellValue("");
// cell.setCellStyle(style);
//
// cell = row.createCell(3);
// cell.setCellValue(((Integer.parseInt(map.get("DOWNLOAD").toString()) % 250 == 0 ? Integer.parseInt(map.get("DOWNLOAD").toString()) / 250 : Integer.parseInt(map.get("DOWNLOAD").toString()) / 250 + 1)) + "");
// num += ((Integer.parseInt(map.get("DOWNLOAD").toString()) % 250 == 0 ? Integer.parseInt(map.get("DOWNLOAD").toString()) / 250 : Integer.parseInt(map.get("DOWNLOAD").toString()) / 250 + 1));
// cell.setCellStyle(style);
//
// cell = row.createCell(4);
// cell.setCellValue("");
// cell.setCellStyle(style);
//
// cell = row.createCell(5);
// cell.setCellValue("");
// cell.setCellStyle(style);
//
// cell = row.createCell(6);
// cell.setCellValue("");
// cell.setCellStyle(style);
//
// cell = row.createCell(7);
// cell.setCellValue("");
// cell.setCellStyle(style);
//
// cell = row.createCell(8);
// cell.setCellValue("");
// cell.setCellStyle(style);
//
// cell = row.createCell(9);
// cell.setCellValue("");
// cell.setCellStyle(style);
//
// cell = row.createCell(10);
// cell.setCellValue("");
// cell.setCellStyle(style);
//
// cell = row.createCell(11);
// cell.setCellValue("");
// cell.setCellStyle(style);
//
// }
// }
/** /**
* 下载装箱单 * 下载装箱单
...@@ -733,11 +851,11 @@ public class UserApi { ...@@ -733,11 +851,11 @@ public class UserApi {
HSSFWorkbook wb = new HSSFWorkbook(); HSSFWorkbook wb = new HSSFWorkbook();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
HSSFSheet sheet = wb.createSheet("二代身份证统计表"); HSSFSheet sheet = wb.createSheet("二代身份证统计表");
sheet.setColumnWidth(0, (int) 30 * 100); sheet.setColumnWidth(0, 30 * 100);
sheet.setColumnWidth(1, (int) 30 * 70); sheet.setColumnWidth(1, 30 * 70);
sheet.setColumnWidth(2, (int) 30 * 80); sheet.setColumnWidth(2, 30 * 80);
sheet.setColumnWidth(3, (int) 30 * 50); sheet.setColumnWidth(3, 30 * 50);
sheet.setColumnWidth(4, (int) 30 * 110); sheet.setColumnWidth(4, 30 * 110);
HSSFPrintSetup ps = sheet.getPrintSetup(); HSSFPrintSetup ps = sheet.getPrintSetup();
ps.setLandscape(true); // 打印方向，true：横向，false：纵向 ps.setLandscape(true); // 打印方向，true：横向，false：纵向
...@@ -827,7 +945,6 @@ public class UserApi { ...@@ -827,7 +945,6 @@ public class UserApi {
cell.setCellValue((String) map.get("COUNTYNAME")); cell.setCellValue((String) map.get("COUNTYNAME"));
cell.setCellStyle(style); cell.setCellStyle(style);
cell = row.createCell(1); cell = row.createCell(1);
cell.setCellValue(map.get("DOWNLOAD").toString().equals("0") ? "" : map.get("DOWNLOAD").toString()); cell.setCellValue(map.get("DOWNLOAD").toString().equals("0") ? "" : map.get("DOWNLOAD").toString());
cell.setCellStyle(style); cell.setCellStyle(style);
cell = row.createCell(2); cell = row.createCell(2);
...@@ -1021,11 +1138,11 @@ public class UserApi { ...@@ -1021,11 +1138,11 @@ public class UserApi {
//创建分单 //创建分单
//创建辖区合单 //创建辖区合单
HSSFSheet mergeSheet = wb.createSheet("辖区合单"); HSSFSheet mergeSheet = wb.createSheet("辖区合单");
mergeSheet.setColumnWidth(0, (int) 30 * 115); mergeSheet.setColumnWidth(0, 30 * 115);
mergeSheet.setColumnWidth(1, (int) 30 * 70); mergeSheet.setColumnWidth(1, 30 * 70);
mergeSheet.setColumnWidth(2, (int) 30 * 80); mergeSheet.setColumnWidth(2, 30 * 80);
mergeSheet.setColumnWidth(3, (int) 30 * 50); mergeSheet.setColumnWidth(3, 30 * 50);
mergeSheet.setColumnWidth(4, (int) 30 * 110); mergeSheet.setColumnWidth(4, 30 * 110);
HSSFPrintSetup ps1 = mergeSheet.getPrintSetup(); HSSFPrintSetup ps1 = mergeSheet.getPrintSetup();
ps1.setLandscape(true); // 打印方向，true：横向，false：纵向 ps1.setLandscape(true); // 打印方向，true：横向，false：纵向
...@@ -1220,13 +1337,13 @@ public class UserApi { ...@@ -1220,13 +1337,13 @@ public class UserApi {
mergeSheet.addMergedRegion(callRangeb); mergeSheet.addMergedRegion(callRangeb);
lineNum++; lineNum++;
} else { } else {
sheet = wb.createSheet(a + "-" + (String) map.get("COUNTYNAME")); sheet = wb.createSheet(a + "-" + map.get("COUNTYNAME"));
sheet.setColumnWidth(0, (int) 30 * 100); sheet.setColumnWidth(0, 30 * 100);
sheet.setColumnWidth(1, (int) 30 * 70); sheet.setColumnWidth(1, 30 * 70);
sheet.setColumnWidth(2, (int) 30 * 80); sheet.setColumnWidth(2, 30 * 80);
sheet.setColumnWidth(3, (int) 30 * 50); sheet.setColumnWidth(3, 30 * 50);
sheet.setColumnWidth(4, (int) 30 * 110); sheet.setColumnWidth(4, 30 * 110);
HSSFPrintSetup ps2 = sheet.getPrintSetup(); HSSFPrintSetup ps2 = sheet.getPrintSetup();
ps2.setLandscape(true); // 打印方向，true：横向，false：纵向 ps2.setLandscape(true); // 打印方向，true：横向，false：纵向
......
src/main/java/com/yxproject/start/api/YingxinApi.java
View file @ 9bf5fff5
...@@ -2,6 +2,7 @@ package com.yxproject.start.api; ...@@ -2,6 +2,7 @@ package com.yxproject.start.api;
//import com.yxproject.start.service.FindCbCountByDealdateViewService; //import com.yxproject.start.service.FindCbCountByDealdateViewService;
import com.yxproject.start.service.CardBodyService; import com.yxproject.start.service.CardBodyService;
import com.yxproject.start.service.FindFinancialReportByViewService;
import com.yxproject.start.service.FindStationCountService; import com.yxproject.start.service.FindStationCountService;
import com.yxproject.start.service.FindTaskByDealdateViewService; import com.yxproject.start.service.FindTaskByDealdateViewService;
import com.yxproject.start.utils.YXJSONResponse; import com.yxproject.start.utils.YXJSONResponse;
...@@ -24,39 +25,73 @@ public class YingxinApi { ...@@ -24,39 +25,73 @@ public class YingxinApi {
@Autowired @Autowired
private FindTaskByDealdateViewService findTaskByDealdateViewService; private FindTaskByDealdateViewService findTaskByDealdateViewService;
// private FindCbCountByDealdateViewService findCbCountByDealdateViewService;
@Autowired @Autowired
private CardBodyService cardBodyService; private CardBodyService cardBodyService;
@Autowired @Autowired
private FindStationCountService findStationCountService; private FindStationCountService findStationCountService;
@Autowired
private FindFinancialReportByViewService findFinancialReportByViewService;
/**
* 查询在受理库查询任务单详情 根据处理时间查询;
*
*
*/
@RequestMapping("getGroupInfo") @RequestMapping("getGroupInfo")
public List<Map<String, Object>> getGroupInfo() { public String getGroupInfo(@RequestParam("startTime") String startTime,@RequestParam("endTime") String endTime, HttpServletResponse resp) {
List<Map<String, Object>> list = findTaskByDealdateViewService.getAccGroupData(); List<Map<String, Object>> list = findTaskByDealdateViewService.getAccGroupData(startTime, endTime);
return list; YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(list);
Map map = new HashMap();
return yxjsonResponse.toJSONString();
} }
/**
* 查询卡基统计报表 用视图查询 根据起止时间查询
*
*
*/
@RequestMapping("getCbCountInfo") @RequestMapping("getCbCountInfo")
public List<Map<String,Object>> getCbCountInfo() { public String getCbCountInfo(@RequestParam("startTime")String startTime ,@RequestParam("endTime")String endTime,HttpServletResponse resp) {
List<Map<String, Object>> list=cardBodyService.getCbCount(); List<Map<String, Object>> list=cardBodyService.getCbCount(startTime, endTime);
return list; YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(list);
Map map = new HashMap();
return yxjsonResponse.toJSONString();
} }
@RequestMapping("getCbBodyCountInfo") @RequestMapping("getCbBodyCountInfo")
public List<Map<String,Object>> getCbBodyCountInfo() { public List<Map<String,Object>> getCbBodyCountInfo() {
List<Map<String,Object>> list=cardBodyService.getCbBodyCount(); List<Map<String,Object>> list=cardBodyService.getCbBodyCount();
return list; return list;
} }
/**
@RequestMapping("getStationCountInfo") * 查询各个工位的已经完成的数量和当天要完成的数量 根据当前日期 当前状态查询
public String getStationCountInfo(@RequestParam("submitDate") String submitDate, HttpServletResponse resp){ *
List<Map<String,Object>> list=findStationCountService.getStationCountData(submitDate); *
*/
@RequestMapping("getStateCountInfo")
public String getStateCountInfo(@RequestParam("submitDate") String submitDate,@RequestParam("state") String state,HttpServletResponse resp){
List<Map<String,Object>> list=findStationCountService.getStationCountData(submitDate,state);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(list);
Map map = new HashMap();
return yxjsonResponse.toJSONString();
}
/**
* 查询财务报表 查询派出所申领表 用视图查询 根据起止时间 类型 地市 区县 派出所查询
*
*
*/
@RequestMapping("getFinancialReportInfo")
public String getFinancialReportInfo(@RequestParam("startTime") String startTime,@RequestParam("endTime") String endTime,@RequestParam("cardType") String cardType,@RequestParam("cityCode")String cityCode,HttpServletResponse resp){
List<Map<String,Object>> list=findFinancialReportByViewService.getFinancialReportData(startTime,endTime,cardType,cityCode);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(list); yxjsonResponse.outPutSuccess(list);
Map map = new HashMap(); Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
} }
src/main/java/com/yxproject/start/entity/AccGroupRelationTEntity.xml deleted 100644 → 0
View file @ 26c02f41
<?xml version="1.0" encoding="UTF-8"?>
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
version="2.0">
<entity class="com.yxproject.start.entity.AccGroupRelationTEntity">
<table name="ACC_GROUP_RELATION_T" schema="ACC_DBA" catalog=""/>
<attributes>
<id name="groupNo">
<column name="GROUP_NO" length="10"/>
</id>
<basic name="originalNo">
<column name="ORIGINAL_NO" length="25"/>
</basic>
<basic name="dealStatus">
<column name="DEAL_STATUS" nullable="false" length="1"/>
</basic>
<basic name="dealDate">
<column name="DEAL_DATE" length="8"/>
</basic>
<basic name="uploadUnitNo">
<column name="UPLOAD_UNIT_NO" length="12"/>
</basic>
</attributes>
</entity>
</entity-mappings>
src/main/java/com/yxproject/start/entity/CityListEntity.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Date;
import java.util.Objects;
/**
* Created by Administrator on 2018/12/19.
*/
@Entity
@Table(name = "CITY_LIST", schema = "DAHAI")
public class CityListEntity {
private long taskId;
private long cardType;
private long oldCardType;
private String citycode;
private Date submitDate;
private Date issuedDate;
private long printState;
private Date downloadDate;
private Date printOutDate;
private Date positionDate;
private Date outWorkshopDate;
private String qualityPeopleName;
private Date qualityTestDate;
private String exceptionInformation;
private Date outStorageDate;
private Date inStorageDate;
private long taskStateId;
private long isException;
private long printerId;
private String cityName;
private long groupCount;
private long groupNo;
private long validCount;
private long invalidCount;
@Id
@Column(name = "taskId", nullable = false, precision = 0)
public long getTaskId() {
return taskId;
}
public void setTaskId(long taskId) {
this.taskId = taskId;
}
@Basic
@Column(name = "cardType", nullable = false, precision = 0)
public long getCardType() {
return cardType;
}
public void setCardType(long cardType) {
this.cardType = cardType;
}
@Basic
@Column(name = "oldCardType", nullable = false, precision = 0)
public long getOldCardType() {
return oldCardType;
}
public void setOldCardType(long oldCardType) {
this.oldCardType = oldCardType;
}
@Basic
@Column(name = "citycode", nullable = true, length = 20)
public String getCitycode() {
return citycode;
}
public void setCitycode(String citycode) {
this.citycode = citycode;
}
@Basic
@Column(name = "submitDate", nullable = true)
public Date getSubmitDate() {
return submitDate;
}
public void setSubmitDate(Date submitDate) {
this.submitDate = submitDate;
}
@Basic
@Column(name = "issuedDate", nullable = true)
public Date getIssuedDate() {
return issuedDate;
}
public void setIssuedDate(Date issuedDate) {
this.issuedDate = issuedDate;
}
@Basic
@Column(name = "printState", nullable = true, precision = 0)
public long getPrintState() {
return printState;
}
public void setPrintState(long printState) {
this.printState = printState;
}
@Basic
@Column(name = "downloadDate", nullable = true)
public Date getDownloadDate() {
return downloadDate;
}
public void setDownloadDate(Date downloadDate) {
this.downloadDate = downloadDate;
}
@Basic
@Column(name = "printOutDate", nullable = true)
public Date getPrintOutDate() {
return printOutDate;
}
public void setPrintOutDate(Date printOutDate) {
this.printOutDate = printOutDate;
}
@Basic
@Column(name = "positionDate", nullable = true)
public Date getPositionDate() {
return positionDate;
}
public void setPositionDate(Date positionDate) {
this.positionDate = positionDate;
}
@Basic
@Column(name = "outWorkshopDate", nullable = true)
public Date getOutWorkshopDate() {
return outWorkshopDate;
}
public void setOutWorkshopDate(Date outWorkshopDate) {
this.outWorkshopDate = outWorkshopDate;
}
@Basic
@Column(name = "qualityPeopleName", nullable = true, length = 20)
public String getQualityPeopleName() {
return qualityPeopleName;
}
public void setQualityPeopleName(String qualityPeopleName) {
this.qualityPeopleName = qualityPeopleName;
}
@Basic
@Column(name = "qualityTestDate", nullable = true)
public Date getQualityTestDate() {
return qualityTestDate;
}
public void setQualityTestDate(Date qualityTestDate) {
this.qualityTestDate = qualityTestDate;
}
@Basic
@Column(name = "exceptionInformation", nullable = true, length = 120)
public String getExceptionInformation() {
return exceptionInformation;
}
public void setExceptionInformation(String exceptionInformation) {
this.exceptionInformation = exceptionInformation;
}
@Basic
@Column(name = "outStorageDate", nullable = true)
public Date getOutStorageDate() {
return outStorageDate;
}
public void setOutStorageDate(Date outStorageDate) {
this.outStorageDate = outStorageDate;
}
@Basic
@Column(name = "inStorageDate", nullable = true)
public Date getInStorageDate() {
return inStorageDate;
}
public void setInStorageDate(Date inStorageDate) {
this.inStorageDate = inStorageDate;
}
@Basic
@Column(name = "taskStateId", nullable = true, precision = 0)
public long getTaskStateId() {
return taskStateId;
}
public void setTaskStateId(long taskStateId) {
this.taskStateId = taskStateId;
}
@Basic
@Column(name = "isException", nullable = true, precision = 0)
public long getIsException() {
return isException;
}
public void setIsException(long isException) {
this.isException = isException;
}
@Basic
@Column(name = "printerId", nullable = true, precision = 0)
public long getPrinterId() {
return printerId;
}
public void setPrinterId(long printerId) {
this.printerId = printerId;
}
@Basic
@Column(name = "cityName", nullable = true, length = 20)
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
@Basic
@Column(name = "groupCount", nullable = true, precision = 0)
public long getGroupCount() {
return groupCount;
}
public void setGroupCount(long groupCount) {
this.groupCount = groupCount;
}
@Basic
@Column(name = "groupNo", nullable = true, precision = 0)
public long getGroupNo() {
return groupNo;
}
public void setGroupNo(long groupNo) {
this.groupNo = groupNo;
}
@Basic
@Column(name = "validCount", nullable = true, precision = 0)
public long getValidCount() {
return validCount;
}
public void setValidCount(long validCount) {
this.validCount = validCount;
}
@Basic
@Column(name = "invalidCount", nullable = true, precision = 0)
public long getInvalidCount() {
return invalidCount;
}
public void setInvalidCount(long invalidCount) {
this.invalidCount = invalidCount;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
CityListEntity that = (CityListEntity) o;
return taskId == that.taskId &&
cardType == that.cardType &&
oldCardType == that.oldCardType &&
Objects.equals(citycode, that.citycode) &&
Objects.equals(submitDate, that.submitDate) &&
Objects.equals(issuedDate, that.issuedDate) &&
Objects.equals(printState, that.printState) &&
Objects.equals(downloadDate, that.downloadDate) &&
Objects.equals(printOutDate, that.printOutDate) &&
Objects.equals(positionDate, that.positionDate) &&
Objects.equals(outWorkshopDate, that.outWorkshopDate) &&
Objects.equals(qualityPeopleName, that.qualityPeopleName) &&
Objects.equals(qualityTestDate, that.qualityTestDate) &&
Objects.equals(exceptionInformation, that.exceptionInformation) &&
Objects.equals(outStorageDate, that.outStorageDate) &&
Objects.equals(inStorageDate, that.inStorageDate) &&
Objects.equals(groupNo, that.groupNo) &&
Objects.equals(validCount, that.validCount) &&
Objects.equals(invalidCount, that.invalidCount) &&
Objects.equals(groupCount, that.groupCount) &&
Objects.equals(cityName, that.cityName) &&
printerId == that.printerId &&
taskStateId == that.taskStateId &&
Objects.equals(isException, that.isException);
}
@Override
public int hashCode() {
return Objects.hash(taskId, cardType, oldCardType, citycode, submitDate, issuedDate, printState, downloadDate, printOutDate, positionDate, outWorkshopDate, qualityPeopleName, qualityTestDate, exceptionInformation,outStorageDate,inStorageDate,printerId,taskStateId,isException,cityName,invalidCount,validCount,groupNo,groupCount);
}
}
src/main/java/com/yxproject/start/entity/CountyEntity.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Objects;
/**
* Created by Administrator on 2018/12/19.
*/
@Entity
@Table(name = "COUNTY", schema = "DAHAI")
public class CountyEntity {
private String county_Code;
private long finish_Count;
private long in_Storage_Count;
private long out_Storage_Count;
private String countyName;
private long downloadCount;
private long electric_writeCount;
@Id
@Column(name = "county_Code", nullable = true, length = 20)
public String getCounty_Code() {
return county_Code;
}
public void setCounty_Code(String county_Code) {
this.county_Code = county_Code;
}
@Basic
@Column(name = "finish_Count", nullable = true, precision = 0)
public long getFinish_Count() {
return finish_Count;
}
public void setFinish_Count(long finish_Count) {
this.finish_Count = finish_Count;
}
@Basic
@Column(name = "in_Storage_Count", nullable = true, precision = 0)
public long getIn_Storage_Count() {
return in_Storage_Count;
}
public void setIn_Storage_Count(long in_Storage_Count) {
this.in_Storage_Count = in_Storage_Count;
}
@Basic
@Column(name = "out_Storage_Count", nullable = true, precision = 0)
public long getOut_Storage_Count() {
return out_Storage_Count;
}
public void setOut_Storage_Count(long out_Storage_Count) {
this.out_Storage_Count = out_Storage_Count;
}
@Basic
@Column(name = "countyName", nullable = true, length = 20)
public String getCountyName() {
return countyName;
}
public void setCountyName(String countyName) {
this.countyName = countyName;
}
@Basic
@Column(name = "downloadCount", nullable = true, precision = 0)
public long getDownloadCount() {
return downloadCount;
}
public void setDownloadCount(long downloadCount) {
this.downloadCount = downloadCount;
}
@Basic
@Column(name = "electric_writeCount", nullable = true, precision = 0)
public long getElectric_writeCount() {
return electric_writeCount;
}
public void setElectric_writeCount(long electric_writeCount) {
this.electric_writeCount = electric_writeCount;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
CountyEntity that = (CountyEntity) o;
return electric_writeCount == that.electric_writeCount &&
downloadCount == that.downloadCount &&
finish_Count == that.finish_Count &&
in_Storage_Count == that.in_Storage_Count &&
out_Storage_Count == that.out_Storage_Count &&
Objects.equals(countyName, that.countyName) &&
Objects.equals(county_Code, that.county_Code);
}
@Override
public int hashCode() {
return Objects.hash(electric_writeCount, downloadCount, finish_Count, in_Storage_Count, out_Storage_Count,countyName,county_Code);
}
}
src/main/java/com/yxproject/start/entity/CountyListEntity.java
View file @ 9bf5fff5
...@@ -48,6 +48,7 @@ public class CountyListEntity { ...@@ -48,6 +48,7 @@ public class CountyListEntity {
public void setSave_Date(Date save_Date) { public void setSave_Date(Date save_Date) {
this.save_Date = save_Date; this.save_Date = save_Date;
} }
@Basic @Basic
@Column(name = "COUNTY_CODE", nullable = true, length = 20) @Column(name = "COUNTY_CODE", nullable = true, length = 20)
public String getCounty_Code() { public String getCounty_Code() {
...@@ -57,6 +58,7 @@ public class CountyListEntity { ...@@ -57,6 +58,7 @@ public class CountyListEntity {
public void setCounty_Code(String county_Code) { public void setCounty_Code(String county_Code) {
this.county_Code = county_Code; this.county_Code = county_Code;
} }
@Basic @Basic
@Column(name = "FINISH_COUNT", nullable = true, precision = 0) @Column(name = "FINISH_COUNT", nullable = true, precision = 0)
public long getFinish_Count() { public long getFinish_Count() {
...@@ -66,6 +68,7 @@ public class CountyListEntity { ...@@ -66,6 +68,7 @@ public class CountyListEntity {
public void setFinish_Count(long finish_Count) { public void setFinish_Count(long finish_Count) {
this.finish_Count = finish_Count; this.finish_Count = finish_Count;
} }
@Basic @Basic
@Column(name = "IN_STORAGE_COUNT", nullable = true, precision = 0) @Column(name = "IN_STORAGE_COUNT", nullable = true, precision = 0)
public long getIn_Storage_Count() { public long getIn_Storage_Count() {
...@@ -75,6 +78,7 @@ public class CountyListEntity { ...@@ -75,6 +78,7 @@ public class CountyListEntity {
public void setIn_Storage_Count(long in_Storage_Count) { public void setIn_Storage_Count(long in_Storage_Count) {
this.in_Storage_Count = in_Storage_Count; this.in_Storage_Count = in_Storage_Count;
} }
@Basic @Basic
@Column(name = "OUT_STORAGE_COUNT", nullable = true, precision = 0) @Column(name = "OUT_STORAGE_COUNT", nullable = true, precision = 0)
public long getOut_Storage_Count() { public long getOut_Storage_Count() {
...@@ -103,4 +107,9 @@ public class CountyListEntity { ...@@ -103,4 +107,9 @@ public class CountyListEntity {
public int hashCode() { public int hashCode() {
return Objects.hash(county_List_Id, task_Id, finish_Count, in_Storage_Count, out_Storage_Count,save_Date,county_Code); return Objects.hash(county_List_Id, task_Id, finish_Count, in_Storage_Count, out_Storage_Count,save_Date,county_Code);
} }
@Override
public String toString() {
return "COUNTY_LIST [county_List_Id=" + county_List_Id + ", task_Id=" + task_Id + ", finish_Count=" + finish_Count + ", in_Storage_Count=" + in_Storage_Count + ", out_Storage_Count=" + out_Storage_Count + ",save_Date=" + save_Date + "county_Code=" + county_Code +" ]";
}
} }
src/main/java/com/yxproject/start/entity/FindFinancialReportByViewEntity.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.entity;
import org.springframework.data.annotation.Id;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* Created by Administrator on 2018/12/19.
*/
@Entity
@Table(name = "FIND_FINANCIAL_REPORT_BY_VIEW", schema = "DAHAI", catalog = "")
public class FindFinancialReportByViewEntity {
private String gajg_Mc;
private Long putongzheng;
private Long kuaizheng;
private Long yidiksyou;
private Long yidikspu;
private Long yidiyou;
private Long yidipu;
private Long junrenzheng;
private Long kspu;
private Long ksyou;
private Long youjizheng;
private Long quanguozheng;
@Id
@Column(name = "GAJG_MC", nullable = true, length = 40)
public String getGajgMc() {
return gajg_Mc;
}
public void setGajgMc(String gajgMc) {
this.gajg_Mc = gajgMc;
}
@Basic
@Column(name = "PUTONGZHENG", nullable = true, precision = 0)
public Long getPutongzheng() {
return putongzheng;
}
public void setPutongzheng(Long putongzheng) {
this.putongzheng = putongzheng;
}
@Basic
@Column(name = "KUAIZHENG", nullable = true, precision = 0)
public Long getKuaizheng() {
return kuaizheng;
}
public void setKuaizheng(Long kuaizheng) {
this.kuaizheng = kuaizheng;
}
@Basic
@Column(name = "YIDIKSYOU", nullable = true, precision = 0)
public Long getYidiksyou() {
return yidiksyou;
}
public void setYidiksyou(Long yidiksyou) {
this.yidiksyou = yidiksyou;
}
@Basic
@Column(name = "YIDIKSPU", nullable = true, precision = 0)
public Long getYidikspu() {
return yidikspu;
}
public void setYidikspu(Long yidikspu) {
this.yidikspu = yidikspu;
}
@Basic
@Column(name = "YIDIYOU", nullable = true, precision = 0)
public Long getYidiyou() {
return yidiyou;
}
public void setYidiyou(Long yidiyou) {
this.yidiyou = yidiyou;
}
@Basic
@Column(name = "YIDIPU", nullable = true, precision = 0)
public Long getYidipu() {
return yidipu;
}
public void setYidipu(Long yidipu) {
this.yidipu = yidipu;
}
@Basic
@Column(name = "JUNRENZHENG", nullable = true, precision = 0)
public Long getJunrenzheng() {
return junrenzheng;
}
public void setJunrenzheng(Long junrenzheng) {
this.junrenzheng = junrenzheng;
}
@Basic
@Column(name = "KSPU", nullable = true, precision = 0)
public Long getKspu() {
return kspu;
}
public void setKspu(Long kspu) {
this.kspu = kspu;
}
@Basic
@Column(name = "KSYOU", nullable = true, precision = 0)
public Long getKsyou() {
return ksyou;
}
public void setKsyou(Long ksyou) {
this.ksyou = ksyou;
}
@Basic
@Column(name = "YOUJIZHENG", nullable = true, precision = 0)
public Long getYoujizheng() {
return youjizheng;
}
public void setYoujizheng(Long youjizheng) {
this.youjizheng = youjizheng;
}
@Basic
@Column(name = "QUANGUOZHENG", nullable = true, precision = 0)
public Long getQuanguozheng() {
return quanguozheng;
}
public void setQuanguozheng(Long quanguozheng) {
this.quanguozheng = quanguozheng;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
FindFinancialReportByViewEntity that = (FindFinancialReportByViewEntity) o;
if (gajg_Mc != null ? !gajg_Mc.equals(that.gajg_Mc) : that.gajg_Mc != null) return false;
if (putongzheng != null ? !putongzheng.equals(that.putongzheng) : that.putongzheng != null) return false;
if (kuaizheng != null ? !kuaizheng.equals(that.kuaizheng) : that.kuaizheng != null) return false;
if (yidiksyou != null ? !yidiksyou.equals(that.yidiksyou) : that.yidiksyou != null) return false;
if (yidikspu != null ? !yidikspu.equals(that.yidikspu) : that.yidikspu != null) return false;
if (yidiyou != null ? !yidiyou.equals(that.yidiyou) : that.yidiyou != null) return false;
if (yidipu != null ? !yidipu.equals(that.yidipu) : that.yidipu != null) return false;
if (junrenzheng != null ? !junrenzheng.equals(that.junrenzheng) : that.junrenzheng != null) return false;
if (kspu != null ? !kspu.equals(that.kspu) : that.kspu != null) return false;
if (ksyou != null ? !ksyou.equals(that.ksyou) : that.ksyou != null) return false;
if (youjizheng != null ? !youjizheng.equals(that.youjizheng) : that.youjizheng != null) return false;
if (quanguozheng != null ? !quanguozheng.equals(that.quanguozheng) : that.quanguozheng != null) return false;
return true;
}
@Override
public int hashCode() {
int result = gajg_Mc != null ? gajg_Mc.hashCode() : 0;
result = 31 * result + (putongzheng != null ? putongzheng.hashCode() : 0);
result = 31 * result + (kuaizheng != null ? kuaizheng.hashCode() : 0);
result = 31 * result + (yidiksyou != null ? yidiksyou.hashCode() : 0);
result = 31 * result + (yidikspu != null ? yidikspu.hashCode() : 0);
result = 31 * result + (yidiyou != null ? yidiyou.hashCode() : 0);
result = 31 * result + (yidipu != null ? yidipu.hashCode() : 0);
result = 31 * result + (junrenzheng != null ? junrenzheng.hashCode() : 0);
result = 31 * result + (kspu != null ? kspu.hashCode() : 0);
result = 31 * result + (ksyou != null ? ksyou.hashCode() : 0);
result = 31 * result + (youjizheng != null ? youjizheng.hashCode() : 0);
result = 31 * result + (quanguozheng != null ? quanguozheng.hashCode() : 0);
return result;
}
private String id;
@javax.persistence.Id
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
}
src/main/java/com/yxproject/start/entity/GroupListEntity.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.entity;
/**
* Created by Administrator on 2018/12/18.
*/
import javax.persistence.*;
import java.io.Serializable;
import java.sql.Time;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@Entity
@Table(name = "TYPE_LIST", schema = "DAHAI")
public class GroupListEntity implements Serializable {
private long groupNo;
private long validCount;
private long invalidCount;
private long specialCardCount;
@Transient
private List<SpecialCardEntity> specialCardList = new ArrayList <SpecialCardEntity>();
@Id
@Column(name = "groupNo", nullable = false, precision = 0)
public long getGroupNo() {
return groupNo;
}
public void setGroupNo(long groupNo) {
this.groupNo = groupNo;
}
@Basic
@Column(name = "validCount", nullable = true, precision = 0)
public long getValidCount() {
return validCount;
}
public void setValidCount(long validCount) {
this.validCount = validCount;
}
@Basic
@Column(name = "invalidCount", nullable = true, precision = 0)
public long getInvalidCount() {
return invalidCount;
}
public void setInvalidCount(long invalidCount) {
this.invalidCount = invalidCount;
}
@Basic
@Column(name = "specialCardCount", nullable = true, precision = 0)
public long getSpecialCardCount() {
return specialCardCount;
}
public void setSpecialCardCount(long specialCardCount) {
this.specialCardCount = specialCardCount;
}
@Transient
public List <SpecialCardEntity > getSpecialCardList() {
return specialCardList;
}
public void setSpecialCardList( List <SpecialCardEntity> specialCardList ) {
this.specialCardList = specialCardList;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
GroupListEntity that = (GroupListEntity) o;
return groupNo == that.groupNo &&
validCount == that.validCount &&
invalidCount == that.invalidCount &&
specialCardCount == that.specialCardCount;
}
@Override
public int hashCode() {
return Objects.hash(groupNo, validCount,invalidCount,specialCardCount);
}
}
src/main/java/com/yxproject/start/entity/GroupNoEntity.java
View file @ 9bf5fff5
...@@ -11,7 +11,7 @@ import java.util.Objects; ...@@ -11,7 +11,7 @@ import java.util.Objects;
public class GroupNoEntity { public class GroupNoEntity {
private long task_Id; private long task_Id;
private String group_No; private String group_No;
private long vaild_Count; private long valid_Count;
private long invalid_Count; private long invalid_Count;
private long special_Card_Count; private long special_Card_Count;
...@@ -34,13 +34,13 @@ public class GroupNoEntity { ...@@ -34,13 +34,13 @@ public class GroupNoEntity {
this.group_No = group_No; this.group_No = group_No;
} }
@Basic @Basic
@Column(name = "VAILD_COUNT", nullable = false, precision = 0) @Column(name = "VALID_COUNT", nullable = false, precision = 0)
public long getVaild_Count() { public long getValid_Count() {
return vaild_Count; return valid_Count;
} }
public void setVaild_Count(long vaild_Count) { public void setValid_Count(long valid_Count) {
this.vaild_Count = vaild_Count; this.valid_Count = valid_Count;
} }
@Basic @Basic
@Column(name = "INVALID_COUNT", nullable = false, precision = 0) @Column(name = "INVALID_COUNT", nullable = false, precision = 0)
...@@ -65,7 +65,7 @@ public class GroupNoEntity { ...@@ -65,7 +65,7 @@ public class GroupNoEntity {
if (this == o) { return true;} if (this == o) { return true;}
if (o == null || getClass() != o.getClass()){ return false;} if (o == null || getClass() != o.getClass()){ return false;}
GroupNoEntity that = (GroupNoEntity) o; GroupNoEntity that = (GroupNoEntity) o;
return vaild_Count == that.vaild_Count && return valid_Count == that.valid_Count &&
invalid_Count == that.invalid_Count && invalid_Count == that.invalid_Count &&
special_Card_Count == that.special_Card_Count && special_Card_Count == that.special_Card_Count &&
task_Id == that.task_Id && task_Id == that.task_Id &&
...@@ -74,6 +74,6 @@ public class GroupNoEntity { ...@@ -74,6 +74,6 @@ public class GroupNoEntity {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash( group_No, task_Id, vaild_Count, invalid_Count,special_Card_Count); return Objects.hash( group_No, task_Id, valid_Count, invalid_Count,special_Card_Count);
} }
} }
src/main/java/com/yxproject/start/entity/ReceiptListEntity.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.List;
import java.util.Objects;
/**
* Created by Administrator on 2018/12/19.
*/
@Entity
@Table(name = "RECEIPT_LIST", schema = "DAHAI")
public class ReceiptListEntity {
private String countyName;
private long boxCount;
private long xiaoJi;
private String PTZ;
private String KZ;
private String YDKSY;
private String YDKSP;
private String YDY;
private String YDP;
private String JRZ;
private String KSY;
private String KSP;
private String YJZ;
@Id
@Column(name = "countyName", nullable = false, length = 20)
public String getCountyName() {
return countyName;
}
public void setCountyName(String countyName) {
this.countyName = countyName;
}
@Basic
@Column(name = "boxCount", nullable = true, precision = 0)
public long getBoxCount() {
return boxCount;
}
public void setBoxCount(long boxCount) {
this.boxCount = boxCount;
}
@Basic
@Column(name = "xiaoJi", nullable = true, precision = 0)
public long getXiaoJi() {
return xiaoJi;
}
public void setXiaoJi(long xiaoJi) {
this.xiaoJi = xiaoJi;
}
@Basic
@Column(name = "PTZ", nullable = true, precision = 0)
public String getPTZ() {
return PTZ;
}
public void setPTZ(String PTZ) {
this.PTZ = PTZ;
}
@Basic
@Column(name = "KZ", nullable = true, precision = 0)
public String getKZ() {
return KZ;
}
public void setKZ(String KZ) {
this.KZ = KZ;
}
@Basic
@Column(name = "YDKSY", nullable = true, precision = 0)
public String getYDKSY() {
return YDKSY;
}
public void setYDKSY(String YDKSY) {
this.YDKSY = YDKSY;
}
@Basic
@Column(name = "YDKSP", nullable = true, precision = 0)
public String getYDKSP() {
return YDKSP;
}
public void setYDKSP(String YDKSP) {
this.YDKSP = YDKSP;
}
@Basic
@Column(name = "YDY", nullable = true, precision = 0)
public String getYDY() {
return YDY;
}
public void setYDY(String YDY) {
this.YDY = YDY;
}
@Basic
@Column(name = "YDP", nullable = true, precision = 0)
public String getYDP() {
return YDP;
}
public void setYDP(String YDP) {
this.YDP = YDP;
}
@Basic
@Column(name = "JRZ", nullable = true, precision = 0)
public String getJRZ() {
return JRZ;
}
public void setJRZ(String JRZ) {
this.JRZ = JRZ;
}
@Basic
@Column(name = "KSY", nullable = true, precision = 0)
public String getKSY() {
return KSY;
}
public void setKSY(String KSY) {
this.KSY = KSY;
}
@Basic
@Column(name = "KSP", nullable = true, precision = 0)
public String getKSP() {
return KSP;
}
public void setKSP(String KSP) {
this.KSP = KSP;
}
@Basic
@Column(name = "YJZ", nullable = true, precision = 0)
public String getYJZ() {
return YJZ;
}
public void setYJZ(String YJZ) {
this.YJZ = YJZ;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ReceiptListEntity that = (ReceiptListEntity) o;
return boxCount == that.boxCount &&
xiaoJi == that.xiaoJi &&
Objects.equals(countyName, that.countyName) &&
Objects.equals(PTZ, that.PTZ) &&
Objects.equals(KZ, that.KZ) &&
Objects.equals(YDKSY, that.YDKSY) &&
Objects.equals(YDKSP, that.YDKSP) &&
Objects.equals(YDY, that.YDY) &&
Objects.equals(YDP, that.YDP) &&
Objects.equals(JRZ, that.JRZ) &&
Objects.equals(KSY, that.KSY) &&
Objects.equals(KSP, that.KSP) &&
Objects.equals(YJZ, that.YJZ);
}
@Override
public int hashCode() {
return Objects.hash(boxCount, xiaoJi, countyName, PTZ, KZ, YDKSY, YDKSP, YDY, YDP, JRZ, KSY, KSP, YJZ);
}
}
src/main/java/com/yxproject/start/entity/TaskEntity.java
View file @ 9bf5fff5
...@@ -31,8 +31,6 @@ public class TaskEntity { ...@@ -31,8 +31,6 @@ public class TaskEntity {
private long is_Exception; private long is_Exception;
private long printer_Id; private long printer_Id;
@Id @Id
@Column(name = "TASK_ID", nullable = false, precision = 0) @Column(name = "TASK_ID", nullable = false, precision = 0)
public long getTask_Id() { public long getTask_Id() {
......
src/main/java/com/yxproject/start/entity/TypeListEntity.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.entity;
/**
* Created by Administrator on 2018/12/18.
*/
import javax.persistence.*;
import java.sql.Time;
import java.util.Date;
import java.util.Objects;
@Entity
@Table(name = "TYPE_LIST", schema = "DAHAI")
public class TypeListEntity {
private long typeCode;
private long typeCount;
private String typeName;
@Id
@Column(name = "typeCode", nullable = false, precision = 0)
public long getTypeCode() {
return typeCode;
}
public void setTypeCode(long typeCode) {
this.typeCode = typeCode;
}
@Basic
@Column(name = "typeCount", nullable = true, precision = 0)
public long getTypeCount() {
return typeCount;
}
public void setTypeCount(long typeCount) {
this.typeCount = typeCount;
}
@Basic
@Column(name = "typeName", nullable = true, precision = 0)
public String getTypeName() {
return typeName;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
TypeListEntity that = (TypeListEntity) o;
return typeCode == that.typeCode &&
typeCount == that.typeCount &&
Objects.equals(typeName, that.typeName);
}
@Override
public int hashCode() {
return Objects.hash(typeCode, typeCount, typeName);
}
}
src/main/java/com/yxproject/start/entity/UserInfo.java
View file @ 9bf5fff5
...@@ -19,6 +19,7 @@ public class UserInfo implements Serializable { ...@@ -19,6 +19,7 @@ public class UserInfo implements Serializable {
private String password; private String password;
private String salt; private String salt;
private byte state; private byte state;
private String workshop;
@ManyToMany(fetch= FetchType.EAGER) @ManyToMany(fetch= FetchType.EAGER)
@JoinTable(name = "SysUserRole", joinColumns = { @JoinColumn(name = "userId") }, inverseJoinColumns ={@JoinColumn(name = "roleId") }) @JoinTable(name = "SysUserRole", joinColumns = { @JoinColumn(name = "userId") }, inverseJoinColumns ={@JoinColumn(name = "roleId") })
private List<SysRole> roleList; private List<SysRole> roleList;
...@@ -78,4 +79,12 @@ public class UserInfo implements Serializable { ...@@ -78,4 +79,12 @@ public class UserInfo implements Serializable {
public void setRoleList(List<SysRole> roleList) { public void setRoleList(List<SysRole> roleList) {
this.roleList = roleList; this.roleList = roleList;
} }
public String getWorkshop() {
return workshop;
}
public void setWorkshop(String workshop) {
this.workshop = workshop;
}
} }
\ No newline at end of file
src/main/java/com/yxproject/start/mapper/CardBodyMapper.java
View file @ 9bf5fff5
...@@ -2,6 +2,7 @@ package com.yxproject.start.mapper; ...@@ -2,6 +2,7 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.CardBodyEntity; import com.yxproject.start.entity.CardBodyEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -14,6 +15,6 @@ import java.util.Map; ...@@ -14,6 +15,6 @@ import java.util.Map;
public interface CardBodyMapper { public interface CardBodyMapper {
public List <CardBodyEntity> insertCardBody(String cardBodyId); public List <CardBodyEntity> insertCardBody(String cardBodyId);
// public int updateCardBody(CardBodyEntity map); // public int updateCardBody(CardBodyEntity map);
public List<Map<String,Object>> findCbCountByDealdateViewData(); public List<Map<String,Object>> findCbCountByDealdateViewData(@Param("startTime")String startTime,@Param("endTime")String endTime );
public List<Map<String,Object>> findCbCountByDealdate(); public List<Map<String,Object>> findCbCountByDealdate();
} }
\ No newline at end of file
src/main/java/com/yxproject/start/mapper/CountyListMapper.java
View file @ 9bf5fff5
package com.yxproject.start.mapper; package com.yxproject.start.mapper;
import com.yxproject.start.entity.CountyEntity;
import com.yxproject.start.entity.CountyListEntity; import com.yxproject.start.entity.CountyListEntity;
import com.yxproject.start.entity.ReceiptListEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -13,11 +16,10 @@ import java.util.Map; ...@@ -13,11 +16,10 @@ import java.util.Map;
@Mapper @Mapper
public interface CountyListMapper { public interface CountyListMapper {
public List<CountyEntity> findCountyList(@Param("taskListId") String taskListId,@Param("taskStateId") String taskStateId,@Param("cardType") String cardType);
public List<CountyListEntity> findCountyListByTaskListID(String tasklistID); public int updateBoundCount(@Param("county_List_Id") String county_List_Id,@Param("out_Storage_Count") String out_Storage_Count,@Param("in_Storage_Count") String in_Storage_Count);
public List<CountyListEntity> findCountyListByTaskStateId(String taskStateId); public List<ReceiptListEntity> getReceiptList( @Param("startDate")String startDate , @Param("endDate") String endDate);
public List<CountyListEntity> findCountyListByCardType(String cardType); public List<CountyListEntity> findStorageCountByTaskListId(String taskListId);
public int updateBoundCount(CountyListEntity countyListEntity); // public List<Map<String, Object>> PrintCountyListXML();
public List<Map<String,Object>> getConnectList(String save_Date);
} }
src/main/java/com/yxproject/start/mapper/FindFinancialReportByViewMapper.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/19.
*/
@Mapper
public interface FindFinancialReportByViewMapper {
public List<Map<String,Object>>findFinancialReportByView(@Param("startTime") String startTime,@Param("endTime")String endTime,@Param("cardType")String cardType,@Param("cityCode")String cityCode);
}
src/main/java/com/yxproject/start/mapper/FindStationCountMapper.java
View file @ 9bf5fff5
package com.yxproject.start.mapper; package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -10,5 +11,5 @@ import java.util.Map; ...@@ -10,5 +11,5 @@ import java.util.Map;
*/ */
@Mapper @Mapper
public interface FindStationCountMapper { public interface FindStationCountMapper {
public List<Map<String,Object>>findStationCountByDealDate(String submitDate); public List<Map<String,Object>>findStationCountByDealDate(@Param("submitDate") String submitDate,@Param("state") String state);
} }
src/main/java/com/yxproject/start/mapper/FindTaskByDealdateViewMapper.java
View file @ 9bf5fff5
...@@ -3,6 +3,7 @@ package com.yxproject.start.mapper; ...@@ -3,6 +3,7 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.FindTaskByDealdateViewEntity; import com.yxproject.start.entity.FindTaskByDealdateViewEntity;
import com.yxproject.start.entity.accu.AccGroupTEntity; import com.yxproject.start.entity.accu.AccGroupTEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -14,5 +15,5 @@ import java.util.Map; ...@@ -14,5 +15,5 @@ import java.util.Map;
@Mapper @Mapper
public interface FindTaskByDealdateViewMapper { public interface FindTaskByDealdateViewMapper {
public List<Map<String,Object>> findTaskByDealdateViewData(); public List<Map<String,Object>> findTaskByDealdateViewData(@Param("startTime") String startTime,@Param("endTime") String endTime);
} }
src/main/java/com/yxproject/start/mapper/GroupNoMapper.java
View file @ 9bf5fff5
package com.yxproject.start.mapper; package com.yxproject.start.mapper;
import com.yxproject.start.entity.GroupListEntity;
import com.yxproject.start.entity.GroupNoEntity; import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
...@@ -18,8 +20,7 @@ public interface GroupNoMapper { ...@@ -18,8 +20,7 @@ public interface GroupNoMapper {
public int findGroupNoCountByTaskId(String task_Id); public int findGroupNoCountByTaskId(String task_Id);
public List<Map<String,Object>> findSpecialCountyList(String task_Id); public List<Map<String,Object>> findSpecialCountyList(String task_Id);
public List<Map<String,Object>> findNormalCountyList(String task_Id); public List<Map<String,Object>> findNormalCountyList(String task_Id);
public List<GroupNoEntity> findGroupNoByTaskListID(String tasklistID); public List<GroupListEntity> findGroupListByTaskListId( String taskListId);
public List<GroupNoEntity> findGroupNoByTaskStateId(String taskStateId);
public List<GroupNoEntity> findGroupNoByCardType(String cardType);
} }
src/main/java/com/yxproject/start/mapper/PoliceStationApplyReasonMapper.java
View file @ 9bf5fff5
...@@ -2,6 +2,7 @@ package com.yxproject.start.mapper; ...@@ -2,6 +2,7 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.PoliceStationApplyReasonEntity; import com.yxproject.start.entity.PoliceStationApplyReasonEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -15,7 +16,7 @@ public interface PoliceStationApplyReasonMapper { ...@@ -15,7 +16,7 @@ public interface PoliceStationApplyReasonMapper {
public int updatePoliceStationApplyReasonEntity(PoliceStationApplyReasonEntity policeStationApplyReasonEntity); public int updatePoliceStationApplyReasonEntity(PoliceStationApplyReasonEntity policeStationApplyReasonEntity);
public List<Map<String,Object>> findNormalApplyReasonByCyclesheetID(String cyclesheetid); public List<Map<String,Object>> findNormalApplyReasonByCyclesheetID(String cyclesheetid);
public List<Map<String,Object>> findSpecialApplyReasonByCyclesheetID(String cyclesheetid); public List<Map<String,Object>> findSpecialApplyReasonByCyclesheetID(String cyclesheetid);
public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(String saveDate); public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate( @Param("startDate") String startDate,@Param("endDate") String endDate);
public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType); public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType);
public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String city); public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String city);
public List<Map<String,Object>> findPoliceStationApplyReasonByCounty(String county); public List<Map<String,Object>> findPoliceStationApplyReasonByCounty(String county);
......
src/main/java/com/yxproject/start/mapper/SpecialCardMapper.java
View file @ 9bf5fff5
...@@ -14,5 +14,6 @@ public interface SpecialCardMapper { ...@@ -14,5 +14,6 @@ public interface SpecialCardMapper {
public void saveSpecialCardEntity(SpecialCardEntity specialCardEntity); public void saveSpecialCardEntity(SpecialCardEntity specialCardEntity);
public void updateSpecialCardEntity(SpecialCardEntity specialCardEntity); public void updateSpecialCardEntity(SpecialCardEntity specialCardEntity);
public List<SpecialCardEntity> findSpecialCardEntityByGroupNo(String groupNo); public List<SpecialCardEntity> findSpecialCardEntityByGroupNo(String groupNo);
public List <SpecialCardEntity> findSpecialCardList( String groupNo);
} }
src/main/java/com/yxproject/start/mapper/TaskMapper.java
View file @ 9bf5fff5
package com.yxproject.start.mapper; package com.yxproject.start.mapper;
import com.yxproject.start.entity.TaskEntity; import com.yxproject.start.entity.*;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -18,7 +19,8 @@ public interface TaskMapper { ...@@ -18,7 +19,8 @@ public interface TaskMapper {
public List<TaskEntity> findTaskEntityByState(int state); public List<TaskEntity> findTaskEntityByState(int state);
public int replaceExceptionInformation(TaskEntity taskEntity); public int replaceExceptionInformation(TaskEntity taskEntity);
public int totalNum (int i); public int totalNum (int i);
public List<Map<String,Object>> findTypeListByTaskStateId(String taskStateId); public List<TypeListEntity> findTypeListByTaskStateId(String taskStateId);
public List<Map<String,Object>> findCityListByTaskStateId(String taskStateId); public List <CityListEntity> findCityList(@Param("taskStateId") String taskStateId,@Param("cardType") String cardType);
public List<Map<String,Object>> findCityListByCardType(String cardType); public int updateOutStorageDate( @Param("taskListId")String taskId, @Param("inStorageCount")String inStorageCount, @Param("outStorageCount")String outStorageCount);
public int updateInStorageDate(String taskListId,String inStorageCount,String outStorageCount);
} }
src/main/java/com/yxproject/start/service/CardBodyService.java
View file @ 9bf5fff5
...@@ -12,7 +12,7 @@ import java.util.Map; ...@@ -12,7 +12,7 @@ import java.util.Map;
public interface CardBodyService { public interface CardBodyService {
public List<CardBodyEntity> insertCardBody(String cardBodyId); public List<CardBodyEntity> insertCardBody(String cardBodyId);
public List<Map<String,Object>> getCbCount(); public List<Map<String,Object>> getCbCount(String startTime,String endTime);
// public int updateCardBody(CardBodyEntity map); // public int updateCardBody(CardBodyEntity map);
......
src/main/java/com/yxproject/start/service/CityListService.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.service;
import org.springframework.stereotype.Service;
import com.yxproject.start.entity.*;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/19.
*/
@Service
public interface CityListService {
public List <CityListEntity> findCityList( String taskStateId ,String cardType);
// public List <CityListEntity> findCityListByCardType(String cardType);
}
src/main/java/com/yxproject/start/service/CountyListService.java
View file @ 9bf5fff5
...@@ -8,10 +8,6 @@ import java.util.Map; ...@@ -8,10 +8,6 @@ import java.util.Map;
public interface CountyListService { public interface CountyListService {
public List<CountyListEntity> findCountyListByTaskListID(String tasklistID); public List<CountyListEntity> findStorageCountByTaskListId(String taskListId);
public List<CountyListEntity> findCountyListByTaskStateId(String taskStateId); public int reviseBoundCount(String county_List_Id, String out_Storage_Count, String in_Storage_Count);
public int reviseOutBoundCount(CountyListEntity countyListEntity);
public int reviseInBoundCount(CountyListEntity countyListEntity);
public List<Map<String, Object>> getConnectList(String save_Date);
public List<CountyListEntity> findCountyListByCardType(String cardType);
} }
src/main/java/com/yxproject/start/service/CountyService.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.service;
import com.yxproject.start.entity.CountyEntity;
import java.util.List;
/**
* Created by Administrator on 2018/12/19.
*/
public interface CountyService {
public List<CountyEntity> findCountyList( String taskListId,String taskStateId,String cardType);
}
src/main/java/com/yxproject/start/service/FindFinancialReportByViewService.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.service;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/19.
*/
public interface FindFinancialReportByViewService {
public List<Map<String,Object>> getFinancialReportData(String startTime, String endTime,String cardType,String cityCode);
}
src/main/java/com/yxproject/start/service/FindStationCountService.java
View file @ 9bf5fff5
...@@ -7,5 +7,5 @@ import java.util.Map; ...@@ -7,5 +7,5 @@ import java.util.Map;
* Created by Administrator on 2018/11/29. * Created by Administrator on 2018/11/29.
*/ */
public interface FindStationCountService { public interface FindStationCountService {
public List<Map<String,Object>>getStationCountData(String submitDate); public List<Map<String,Object>>getStationCountData(String submitDate,String state);
} }
src/main/java/com/yxproject/start/service/FindTaskByDealdateViewService.java
View file @ 9bf5fff5
...@@ -9,5 +9,5 @@ import java.util.Map; ...@@ -9,5 +9,5 @@ import java.util.Map;
* Created by Administrator on 2018/11/21. * Created by Administrator on 2018/11/21.
*/ */
public interface FindTaskByDealdateViewService { public interface FindTaskByDealdateViewService {
public List<Map<String,Object>> getAccGroupData(); public List<Map<String,Object>> getAccGroupData(String startTime,String endTime);
} }
src/main/java/com/yxproject/start/service/GroupListService.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.service;
import com.yxproject.start.entity.GroupListEntity;
import java.util.List;
/**
* Created by Administrator on 2018/12/18.
*/
public interface GroupListService {
public List<GroupListEntity> findGroupListByTaskListId( String taskListId);
}
src/main/java/com/yxproject/start/service/GroupNoService.java
View file @ 9bf5fff5
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.GroupListEntity;
import com.yxproject.start.entity.GroupNoEntity; import com.yxproject.start.entity.GroupNoEntity;
import java.util.List; import java.util.List;
...@@ -10,8 +11,6 @@ import java.util.Map; ...@@ -10,8 +11,6 @@ import java.util.Map;
*/ */
public interface GroupNoService { public interface GroupNoService {
public List<Map<String, Object>> findCountyInfoList(String taskID); public List<Map<String, Object>> findCountyInfoList(String taskID);
public List<GroupNoEntity> findGroupNoByTaskListID(String tasklistID);
public List<GroupNoEntity> findGroupNoByTaskStateId(String taskStateId);
public List<GroupNoEntity> findGroupNoByCardType(String cardType);
} }
src/main/java/com/yxproject/start/service/PoliceStationApplyReasonService.java
View file @ 9bf5fff5
...@@ -8,7 +8,7 @@ import java.util.Map; ...@@ -8,7 +8,7 @@ import java.util.Map;
*/ */
public interface PoliceStationApplyReasonService { public interface PoliceStationApplyReasonService {
public int savePoliceStationApplyReasonEntity(String cyclesheetID); public int savePoliceStationApplyReasonEntity(String cyclesheetID);
public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(String saveDate); public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(String startDate,String endDate);
public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType); public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType);
public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String cityCode); public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String cityCode);
} }
src/main/java/com/yxproject/start/service/ReceiptListService.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.service;
import com.yxproject.start.entity.ReceiptListEntity;
import java.util.List;
/**
* Created by Administrator on 2018/12/19.
*/
public interface ReceiptListService {
public List <ReceiptListEntity> getReceiptList( String startDate, String endDate);
}
src/main/java/com/yxproject/start/service/TaskService.java
View file @ 9bf5fff5
...@@ -10,7 +10,7 @@ public interface TaskService { ...@@ -10,7 +10,7 @@ public interface TaskService {
public List<TaskEntity> findProductionTaskListEntityByID(long id); public List<TaskEntity> findProductionTaskListEntityByID(long id);
public int updateProductionTask(TaskEntity map); public int updateProductionTask(TaskEntity taskId);
public int addProductionTaskListEntity(TaskEntity taskEntity, List<GroupNoEntity> groupNoEntities); public int addProductionTaskListEntity(TaskEntity taskEntity, List<GroupNoEntity> groupNoEntities);
...@@ -28,15 +28,9 @@ public interface TaskService { ...@@ -28,15 +28,9 @@ public interface TaskService {
public int addExceptionState(TaskEntity state); public int addExceptionState(TaskEntity state);
public int updateOutBoundDate(TaskEntity taskEntity, CountyListEntity countyListEntity); public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount);
public int updateInStorageDate(TaskEntity taskEntity, CountyListEntity countyListEntity );
public List<Map<String,Object>> findTypeListByTaskStateId( String taskStateId);
public List<Map<String,Object>> findCityListByTaskStateId(String taskStateId);
public List<Map<String,Object>> findCityListByCardType(String cardType);
} }
src/main/java/com/yxproject/start/service/TypeListService.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.service;
import com.yxproject.start.entity.TypeListEntity;
import java.util.List;
/**
* Created by Administrator on 2018/12/19.
*/
public interface TypeListService {
public List<TypeListEntity> findTypeListByTaskStateId( String taskStateId);
}
src/main/java/com/yxproject/start/service/impl/CardBodyServiceImpl.java
View file @ 9bf5fff5
...@@ -24,8 +24,8 @@ public class CardBodyServiceImpl implements CardBodyService { ...@@ -24,8 +24,8 @@ public class CardBodyServiceImpl implements CardBodyService {
private CardBodyMapper cardBodyMapper; private CardBodyMapper cardBodyMapper;
@Override @Override
public List<Map<String,Object>> getCbCount(){ public List<Map<String,Object>> getCbCount(String startTime,String endTime){
List<Map<String,Object>> list=cardBodyMapper.findCbCountByDealdateViewData(); List<Map<String,Object>> list=cardBodyMapper.findCbCountByDealdateViewData(startTime,endTime);
return list; return list;
} }
......
src/main/java/com/yxproject/start/service/impl/CityListServiceImpl.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.CityListEntity;
import com.yxproject.start.mapper.TaskMapper;
import com.yxproject.start.service.CityListService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/19.
*/
@Service
public class CityListServiceImpl implements CityListService {
@Autowired
public TaskMapper taskMapper;
@Override
public List <CityListEntity> findCityList( String taskStateId ,String cardType) {
List <CityListEntity> cityList =taskMapper.findCityList(taskStateId, cardType);
return cityList;
}
}
src/main/java/com/yxproject/start/service/impl/CountyListServiceImpl.java
View file @ 9bf5fff5
...@@ -6,7 +6,6 @@ import com.yxproject.start.service.CountyListService; ...@@ -6,7 +6,6 @@ import com.yxproject.start.service.CountyListService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -20,39 +19,25 @@ public class CountyListServiceImpl implements CountyListService { ...@@ -20,39 +19,25 @@ public class CountyListServiceImpl implements CountyListService {
@Autowired @Autowired
public CountyListMapper countyListMapper; public CountyListMapper countyListMapper;
@Override
public List<CountyListEntity> findCountyListByTaskListID(String tasklistid) {
List<CountyListEntity> byTaskListID = countyListMapper.findCountyListByTaskListID(tasklistid);
return byTaskListID;
}
@Override
public List <CountyListEntity> findCountyListByTaskStateId(String taskStateId) {
List<CountyListEntity> TaskStateId = countyListMapper.findCountyListByTaskStateId(taskStateId);
return TaskStateId;
}
@Override
public List <CountyListEntity> findCountyListByCardType( String cardType ) {
List<CountyListEntity> CardType = countyListMapper.findCountyListByCardType(cardType);
return CardType;
}
@Override
public int reviseOutBoundCount(CountyListEntity countyListEntity) {
countyListEntity.setOut_Storage_Count(countyListEntity.getOut_Storage_Count());
return countyListMapper.updateBoundCount(countyListEntity);
}
@Override @Override
public int reviseInBoundCount(CountyListEntity countyListEntity) { public int reviseBoundCount(String county_List_Id, String out_Storage_Count, String in_Storage_Count) {
countyListEntity.setIn_Storage_Count(countyListEntity.getIn_Storage_Count()); int i= 0;
return countyListMapper.updateBoundCount(countyListEntity); if(out_Storage_Count.equals(0)&&!in_Storage_Count.equals(0)){
i=countyListMapper.updateBoundCount(county_List_Id, out_Storage_Count, in_Storage_Count);
}
if(!out_Storage_Count.equals(0)&&in_Storage_Count.equals(0)){
i=countyListMapper.updateBoundCount(county_List_Id, out_Storage_Count, in_Storage_Count);
}
if(!out_Storage_Count.equals(0)&&!in_Storage_Count.equals(0)){
i=countyListMapper.updateBoundCount(county_List_Id, out_Storage_Count, in_Storage_Count);
}
return i;
} }
@Override @Override
public List<Map<String, Object>> getConnectList(String save_Date) { public List<CountyListEntity> findStorageCountByTaskListId(String taskListId){
return countyListMapper.getConnectList(save_Date); return countyListMapper.findStorageCountByTaskListId(taskListId);
} }
......
src/main/java/com/yxproject/start/service/impl/CountyServiceImpl.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.service.impl;
//import com.yxproject.start.entity.CountyEntity;
import com.yxproject.start.entity.CountyEntity;
import com.yxproject.start.mapper.CountyListMapper;
import com.yxproject.start.service.CountyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* Created by Administrator on 2018/12/19.
*/
@Service
public class CountyServiceImpl implements CountyService {
@Autowired
public CountyListMapper countyListMapper;
@Override
public List <CountyEntity> findCountyList( String taskListId, String taskStateId, String cardType ) {
List<CountyEntity> county = countyListMapper.findCountyList(taskListId,taskStateId,cardType);
return county;
}
}
\ No newline at end of file
src/main/java/com/yxproject/start/service/impl/FindFinancialReportByViewImpl.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.service.impl;
import com.yxproject.start.mapper.FindFinancialReportByViewMapper;
import com.yxproject.start.service.FindFinancialReportByViewService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/19.
*/
@Service
public class FindFinancialReportByViewImpl implements FindFinancialReportByViewService {
@Autowired
private FindFinancialReportByViewMapper findFinancialReportByViewMapper;
@Override
public List<Map<String,Object>> getFinancialReportData(String startTime, String endTime,String cardType,String cityCode) {
List<Map<String,Object>> list=findFinancialReportByViewMapper.findFinancialReportByView(startTime, endTime, cardType, cityCode);
return list;
}
}
src/main/java/com/yxproject/start/service/impl/FindStationCountServiceImpl.java
View file @ 9bf5fff5
...@@ -17,8 +17,8 @@ public class FindStationCountServiceImpl implements FindStationCountService { ...@@ -17,8 +17,8 @@ public class FindStationCountServiceImpl implements FindStationCountService {
private FindStationCountMapper findStationCountMapper; private FindStationCountMapper findStationCountMapper;
@Override @Override
public List<Map<String,Object>>getStationCountData(String submitDate) { public List<Map<String,Object>>getStationCountData(String submitDate,String state) {
List<Map<String,Object>> list=findStationCountMapper.findStationCountByDealDate(submitDate); List<Map<String,Object>> list=findStationCountMapper.findStationCountByDealDate(submitDate,state);
return list; return list;
} }
......
src/main/java/com/yxproject/start/service/impl/FindTaskByDealdateViewServiceImpl.java
View file @ 9bf5fff5
...@@ -19,9 +19,9 @@ public class FindTaskByDealdateViewServiceImpl implements FindTaskByDealdateView ...@@ -19,9 +19,9 @@ public class FindTaskByDealdateViewServiceImpl implements FindTaskByDealdateView
@Override @Override
public List<Map<String,Object>> getAccGroupData() { public List<Map<String,Object>> getAccGroupData(String startTime, String endTime) {
List<Map<String,Object>> list = findTaskByDealdateViewMapper.findTaskByDealdateViewData(); List<Map<String,Object>> list = findTaskByDealdateViewMapper.findTaskByDealdateViewData(startTime, endTime);
return list; return list;
} }
} }
src/main/java/com/yxproject/start/service/impl/GroupListServiceImpl.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.GroupListEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import com.yxproject.start.mapper.GroupNoMapper;
import com.yxproject.start.mapper.SpecialCardMapper;
import com.yxproject.start.service.GroupListService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Created by Administrator on 2018/12/18.
*/
@Service
public class GroupListServiceImpl implements GroupListService {
@Autowired
public GroupNoMapper groupNoMapper;
@Autowired
public SpecialCardMapper specialCardMapper;
@Override
public List<GroupListEntity> findGroupListByTaskListId( String taskListId) {
List <GroupListEntity> groupList=groupNoMapper.findGroupListByTaskListId(taskListId);
for ( GroupListEntity groupListEntity:groupList) {
List <SpecialCardEntity> specialCardEntities=specialCardMapper.findSpecialCardList(groupListEntity.getGroupNo()+"");
groupListEntity.setSpecialCardList(specialCardEntities);
}
return groupList;
}
}
src/main/java/com/yxproject/start/service/impl/GroupNoServiceImpl.java
View file @ 9bf5fff5
package com.yxproject.start.service.impl; package com.yxproject.start.service.impl;
import com.yxproject.start.entity.GroupListEntity;
import com.yxproject.start.entity.GroupNoEntity; import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import com.yxproject.start.mapper.GroupNoMapper; import com.yxproject.start.mapper.GroupNoMapper;
import com.yxproject.start.service.GroupNoService; import com.yxproject.start.service.GroupNoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -30,22 +32,6 @@ public class GroupNoServiceImpl implements GroupNoService { ...@@ -30,22 +32,6 @@ public class GroupNoServiceImpl implements GroupNoService {
return list; return list;
} }
@Override
public List<GroupNoEntity> findGroupNoByTaskListID( String tasklistid) {
List<GroupNoEntity> byTaskListID = groupNoMapper.findGroupNoByTaskListID(tasklistid);
return byTaskListID;
}
@Override
public List <GroupNoEntity> findGroupNoByTaskStateId(String taskStateId) {
List<GroupNoEntity> TaskStateId = groupNoMapper.findGroupNoByTaskStateId(taskStateId);
return TaskStateId;
}
@Override
public List <GroupNoEntity> findGroupNoByCardType( String cardType ) {
List<GroupNoEntity> CardType = groupNoMapper.findGroupNoByCardType(cardType);
return CardType;
}
} }
src/main/java/com/yxproject/start/service/impl/PoliceStationApplyReasonServiceImpl.java
View file @ 9bf5fff5
...@@ -54,8 +54,8 @@ public class PoliceStationApplyReasonServiceImpl implements PoliceStationApplyRe ...@@ -54,8 +54,8 @@ public class PoliceStationApplyReasonServiceImpl implements PoliceStationApplyRe
* @return * @return
*/ */
@Override @Override
public List <Map <String, Object>> findPoliceStationApplyReasonBySaveDate( String saveDate ) { public List <Map <String, Object>> findPoliceStationApplyReasonBySaveDate(String startDate,String endDate) {
List <Map <String, Object>> SaveData =policeStationApplyReasonMapper.findPoliceStationApplyReasonBySaveDate(saveDate); List <Map <String, Object>> SaveData =policeStationApplyReasonMapper.findPoliceStationApplyReasonBySaveDate(startDate,endDate);
return SaveData; return SaveData;
} }
......
src/main/java/com/yxproject/start/service/impl/ReceiptListServiceImpl.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.ReceiptListEntity;
import com.yxproject.start.mapper.CountyListMapper;
import com.yxproject.start.service.ReceiptListService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Created by Administrator on 2018/12/19.
*/
@Service
public class ReceiptListServiceImpl implements ReceiptListService {
@Autowired
public CountyListMapper countyListMapper;
@Override
public List <ReceiptListEntity> getReceiptList( String startDate, String endDate ) {
return countyListMapper.getReceiptList(startDate,endDate);
}
}
src/main/java/com/yxproject/start/service/impl/TaskServiceImpl.java
View file @ 9bf5fff5
...@@ -62,7 +62,7 @@ public class TaskServiceImpl implements TaskService { ...@@ -62,7 +62,7 @@ public class TaskServiceImpl implements TaskService {
* @return * @return
*/ */
@Override @Override
public int updateProductionTask(TaskEntity taskEntity) { public int updateProductionTask( TaskEntity taskEntity ) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
//todo 状态更新时间 //todo 状态更新时间
Long state = taskEntity.getTask_State_Id(); Long state = taskEntity.getTask_State_Id();
...@@ -209,7 +209,7 @@ public class TaskServiceImpl implements TaskService { ...@@ -209,7 +209,7 @@ public class TaskServiceImpl implements TaskService {
groupNoEntity1.setTask_Id(taskEntity.getTask_Id()); groupNoEntity1.setTask_Id(taskEntity.getTask_Id());
groupNoEntity1.setGroup_No(group_no.toString()); groupNoEntity1.setGroup_No(group_no.toString());
groupNoEntity1.setInvalid_Count(Long.valueOf(invalid_count.toString())); groupNoEntity1.setInvalid_Count(Long.valueOf(invalid_count.toString()));
groupNoEntity1.setVaild_Count(Long.valueOf(valid_count.toString())); groupNoEntity1.setValid_Count(Long.valueOf(valid_count.toString()));
groupNoEntity1.setSpecial_Card_Count((long) 1); groupNoEntity1.setSpecial_Card_Count((long) 1);
groupNoMapper.insertGroupNoEntity(groupNoEntity1); groupNoMapper.insertGroupNoEntity(groupNoEntity1);
...@@ -433,79 +433,25 @@ public class TaskServiceImpl implements TaskService { ...@@ -433,79 +433,25 @@ public class TaskServiceImpl implements TaskService {
return i; return i;
} }
/** /**
* 更新出库时间 * 更新出入库时间
* @param * @param
* @param countyListEntity
* @return * @return
*/ */
@Override @Override
public int updateOutBoundDate(TaskEntity taskEntity, CountyListEntity countyListEntity) { public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount ) {
int i=0; int i=0;
i= taskMapper.totalNum(i); i= taskMapper.totalNum(i);
if (countyListEntity.getOut_Storage_Count()==i){ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss"); if (inStorageCount.equals(i)){
taskEntity.setOut_Storage_Date(new Date()); return taskMapper.updateInStorageDate(taskListId,inStorageCount,outStorageCount);
return taskMapper.updateTaskEntity(taskEntity);
}
else{
return 0;
}
}
/**
* 更新入库时间
* @param
* @return
*/
@Override
public int updateInStorageDate(TaskEntity taskEntity, CountyListEntity countyListEntity ) {
int i=0;
i= taskMapper.totalNum(i);
if (countyListEntity.getIn_Storage_Count()==i){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
taskEntity.setIn_Storage_Date(new Date());
return taskMapper.updateTaskEntity(taskEntity);
} }
else{ if(outStorageCount.equals(i)){
return 0; return taskMapper.updateOutStorageDate(taskListId,inStorageCount,outStorageCount);
} }
return 0;
} }
/**
* 通过状态查找TypeList
* @param
* @return
*/
@Override
public List <Map <String, Object>> findTypeListByTaskStateId( String taskStateId ) {
List <Map <String, Object>> TaskStateId =taskMapper.findTypeListByTaskStateId(taskStateId);
return TaskStateId;
}
/**
* 通过状态查找CityList
* @param
* @return
*/
@Override
public List <Map <String, Object>> findCityListByTaskStateId( String taskStateId ) {
List <Map <String, Object>> TaskStateId =taskMapper.findCityListByTaskStateId(taskStateId);
return TaskStateId;
}
/**
* 通过制证类型查找CityList
* @param
* @return
*/
@Override
public List <Map <String, Object>> findCityListByCardType( String cardType ) {
List <Map <String, Object>> CardType =taskMapper.findCityListByCardType(cardType);
return CardType;
}
/** /**
* 测试查询 * 测试查询
......
src/main/java/com/yxproject/start/service/impl/TypeListServiceImpl.java 0 → 100644
View file @ 9bf5fff5
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.TypeListEntity;
import com.yxproject.start.mapper.TaskMapper;
import com.yxproject.start.service.TypeListService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Created by Administrator on 2018/12/19.
*/
@Service
public class TypeListServiceImpl implements TypeListService {
@Autowired
public TaskMapper taskMapper;
/**
* 通过状态查找TypeList
* @param
* @return
*/
@Override
public List<TypeListEntity> findTypeListByTaskStateId( String taskStateId ) {
List<TypeListEntity> typeListEntity = taskMapper.findTypeListByTaskStateId(taskStateId);
return typeListEntity;
}
}
src/main/resources/log4j.properties 0 → 100644
View file @ 9bf5fff5
log4j.rootCategory=DEBUG,stdout,DebugAppender,InfoAppender,ErrorAppender
log4j.debug=true
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[QC] %p [%t] %C.%M(%L) | %m%n
#logger input file
log4j.logger.DebugAppender.access=DEBUG
log4j.appender.DebugAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.DebugAppender.File=../logs/a.log
log4j.appender.DebugAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.DebugAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#logger input file
log4j.logger.InfoAppender.access=INFO
log4j.appender.InfoAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.InfoAppender.File=../logs/b.log
log4j.appender.InfoAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.InfoAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#error log input file
log4j.logger.ErrorAppender.access=ERROR
log4j.appender.ErrorAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.ErrorAppender.File=../logs/c.log
log4j.appender.ErrorAppender.Append = true
log4j.appender.ErrorAppender.threshold = ERROR
log4j.appender.ErrorAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.ErrorAppender.layout.ConversionPattern=%d{MM-dd HH:mm:ss.SSS} %c %-5p - %m%n
\ No newline at end of file
src/main/resources/mapper/CardBodyMapper.xml
View file @ 9bf5fff5
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
</update> </update>
<select id="findCbCountByDealdateViewData" resultType="java.util.HashMap"> <select id="findCbCountByDealdateViewData" resultType="java.util.HashMap" parameterType="String">
select * from FINDCBCOUNTBYDEALDATE_VIEW SELECT * FROM FINDCBCOUNTBYDEALDATE_VIEW WHERE FIND_CBCOUNT_LIST.SET_STARTTIME_PARAM(#{startTime})=#{startTime} AND FIND_CBCOUNT_LIST.SET_ENDTIME_PARAM(#{endTime})=#{endTime}
</select> </select>
<select id="findCbCountByDealdate" resultType="java.util.HashMap"> <select id="findCbCountByDealdate" resultType="java.util.HashMap">
WITH WITH
......
src/main/resources/mapper/CountyListMapper.xml
View file @ 9bf5fff5
...@@ -14,24 +14,63 @@ ...@@ -14,24 +14,63 @@
<!--<insert id="addPermissionByMap" parameterType="com.yxproject.start.entity.SysPermission">--> <!--<insert id="addPermissionByMap" parameterType="com.yxproject.start.entity.SysPermission">-->
<!--Insert into DAHAI.SYS_PERMISSION (ID,AVAILABLE,NAME,PARENT_ID,PARENT_IDS,PERMISSION,RESOURCE_TYPE,URL) values (PERMISSION_seq.nextval,0,#{name},#{parentId},#{parentIds},#{permission},#{resourceType},#{url})--> <!--Insert into DAHAI.SYS_PERMISSION (ID,AVAILABLE,NAME,PARENT_ID,PARENT_IDS,PERMISSION,RESOURCE_TYPE,URL) values (PERMISSION_seq.nextval,0,#{name},#{parentId},#{parentIds},#{permission},#{resourceType},#{url})-->
<!--</insert>--> <!--</insert>-->
<select id="findCountyListByTaskListID" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String"> <select id="findCountyList" resultType="com.yxproject.start.entity.CountyEntity" parameterType="String">
SELECT * FROM COUNTY_LIST where TASK_ID=#{task_Id} SELECT COUNTY_LIST.COUNTY_CODE,FINISH_COUNT,IN_STORAGE_COUNT,OUT_STORAGE_COUNT,COUNTY_DIC.COUNTYNAME FROM COUNTY_LIST
LEFT JOIN TASK ON COUNTY_LIST.TASK_ID = TASK.TASK_ID
LEFT JOIN COUNTY_DIC ON COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE
WHERE TASK.TASK_ID=#{taskListId} AND TASK.CARD_TYPE=#{cardType} AND TASK.TASK_STATE_ID=#{taskStateId}
</select> </select>
<select id="findCountyListByTaskStateId" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String"> <update id="updateBoundCount" parameterType="String" >
SELECT * FROM COUNTY_LIST left join TASK on COUNTY_LIST.TASK_ID = TASK.TASK_ID where TASK_STATE_ID=#{task_State_Id}
</select>
<select id="findCountyListByCardType" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String">
SELECT * FROM COUNTY_LIST left join TASK on COUNTY_LIST.TASK_ID = TASK.TASK_ID left join CARD_TYPE_DIC on TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID where CARD_TYPE_DIC.CARD_TYPE=#{card_Type}
</select>
<update id="updateBoundCount" parameterType="com.yxproject.start.entity.CountyListEntity" >
update COUNTY_LIST SET OUT_STORAGE_COUNT =#{out_Storage_Count},IN_STORAGE_COUNT =#{in_Storage_Count} where COUNTY_LIST_ID =#{county_List_Id} update COUNTY_LIST SET OUT_STORAGE_COUNT =#{out_Storage_Count},IN_STORAGE_COUNT =#{in_Storage_Count} where COUNTY_LIST_ID =#{county_List_Id}
</update> </update>
<select id="getConnectList" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String"> <select id="getReceiptList" resultType="com.yxproject.start.entity.ReceiptListEntity" parameterType="String">
SELECT OUT_STORAGE_COUNT FROM COUNTY_LIST WITH
t_county
AS(
SELECT COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,SUM(COUNTY_LIST.OUT_STORAGE_COUNT) AS TYPE_COUNT,floor(SUM(COUNTY_LIST.OUT_STORAGE_COUNT)/250)+1 AS BOX_COUNT,SAVE_DATE
FROM (SELECT CARD_TYPE_ID,CARD_TYPE FROM CARD_TYPE_DIC GROUP BY CARD_TYPE_ID,CARD_TYPE ) CARD_TYPE_DIC
LEFT JOIN (SELECT TASK_ID,CARD_TYPE FROM TASK GROUP BY TASK_ID,CARD_TYPE) TASK ON CARD_TYPE_DIC.CARD_TYPE_ID = TASK.CARD_TYPE
LEFT JOIN (SELECT COUNTY_CODE,TASK_ID,OUT_STORAGE_COUNT,SAVE_DATE FROM COUNTY_LIST GROUP BY COUNTY_CODE,TASK_ID,OUT_STORAGE_COUNT,SAVE_DATE) COUNTY_LIST ON COUNTY_LIST.TASK_ID = TASK.TASK_ID
LEFT JOIN (SELECT COUNTY_CODE,COUNTYNAME FROM COUNTY_DIC GROUP BY COUNTY_CODE,COUNTYNAME ) COUNTY_DIC ON COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE
GROUP BY COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,SAVE_DATE
),
t_total_count
AS(
SELECT * FROM (SELECT COUNTYNAME,CARD_TYPE,TYPE_COUNT,BOX_COUNT,SAVE_DATE FROM t_county) PIVOT(SUM(TYPE_COUNT) FOR CARD_TYPE IN ('普通证' AS PTZ,'快证' AS KZ,'省内异地快速通道邮' AS YDKSY,'省内异地快速通道
普' AS YDKSP,'省内异地邮' AS YDY,'省内异地普' AS YDP,'军人证' AS JRZ,'快速通道普' AS KSP,'快速通道邮' AS KSY,'邮寄证' AS YJZ))
),
county_xiaoji
AS(
SELECT COUNTYNAME,SUM(TYPE_COUNT) AS XIAOJI FROM t_county GROUP BY COUNTYNAME
)
SELECT DECODE(GROUPING(t_total_count.COUNTYNAME),1,'总计',t_total_count.COUNTYNAME)COUNTYNAME,
SUM(PTZ)PTZ,
SUM(KZ)KZ,
SUM(YDKSY)YDKSY,
SUM(YDKSP)YDKSP,
SUM(YDY)YDY,
SUM(YDP)YDP,
SUM(JRZ)JRZ,
SUM(KSP)KSP,
SUM(KSY)KSY,
SUM(YJZ)YJZ,
SUM(XIAOJI)XIAOJI,
SUM(BOX_COUNT)BOX_COUNT
FROM t_total_count,county_xiaoji WHERE t_total_count.COUNTYNAME=county_xiaoji.COUNTYNAME AND substr(TO_CHAR(SAVE_DATE,'yyyyMMdd'),0,8) >= #{startDate} AND #{endDate} >= substr(TO_CHAR(SAVE_DATE,'yyyyMMdd'),0,8)
GROUP BY ROLLUP(t_total_count.COUNTYNAME)
</select> </select>
<select id="findStorageCountByTaskListId" resultType="java.util.HashMap" parameterType="String">
SELECT TASK_ID,FINISH_COUNT,IN_STORAGE_COUNT,OUT_STORAGE_COUNT,CITY_DIC.CITYNAME||' '||COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE FROM COUNTY_LIST
LEFT JOIN COUNTY_DIC ON COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE
LEFT JOIN CITY_DIC ON substr(CITY_DIC.CITYCODE,1,4) = substr(COUNTY_LIST.COUNTY_CODE,1,4)
WHERE TASK_ID=#{task_Id}
</select>
<!--<select id="PrintCountyListXML" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String">-->
<!--SELECT * FROM COUNTY_LIST-->
<!--</select>-->
</mapper> </mapper>
src/main/resources/mapper/FindFinancialReportByViewMapper.xml 0 → 100644
View file @ 9bf5fff5
<?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.yxproject.start.mapper.FindFinancialReportByViewMapper">
<resultMap id="FindFinancialReportByViewMapper" type="com.yxproject.start.entity.FindFinancialReportByViewEntity">
<id column="GAJG_MC" property="gajg_Mc" jdbcType="VARCHAR"/>
<result column="PUTONGZHENG" property="putongzheng" jdbcType="NUMERIC"/>
<result column="KUAIZHENG" property="kuaizheng" jdbcType="NUMERIC"/>
<result column="YIDIKSYOU" property="yidiksyou" jdbcType="NUMERIC"/>
<result column="YIDIKSPU" property="yidikspu" jdbcType="NUMERIC"/>
<result column="YIDIYOU" property="yidiyou" jdbcType="NUMERIC"/>
<result column="YIDIPU" property="yidipu" jdbcType="NUMERIC"/>
<result column="JUNRENZHENG" property="junrenzheng" jdbcType="NUMERIC"/>
<result column="KSPU" property="kspu" jdbcType="NUMERIC"/>
<result column="KSYOU" property="ksyou" jdbcType="NUMERIC"/>
<result column="YOUJIZHENG" property="youjizheng" jdbcType="NUMERIC"/>
<result column="QUANGUOZHENG" property="quanguozheng" jdbcType="NUMERIC"/>
</resultMap>
<select id="findFinancialReportByView" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM FIND_FINANCIAL_REPORT_BY_VIEW WHERE FIND_FINANCIAL_REPORT_LIST.SET_STARTTIME_PARAM(#{startTime})=#{startTime} AND FIND_FINANCIAL_REPORT_LIST.SET_ENDTIME_PARAM(#{endTime})=#{endTime} AND FIND_FINANCIAL_REPORT_LIST.SET_CARDTYPE_PARAM(#{cardType})=#{cardType} AND FIND_FINANCIAL_REPORT_LIST.SET_CITYCODE_PARAM(SUBSTR(#{cityCode},1,4))=SUBSTR(#{cityCode},1,4) AND FIND_FINANCIAL_REPORT_LIST.SET_COUNTYCODE_PARAM(SUBSTR(#{cityCode},1,6))=SUBSTR(#{cityCode},1,6) AND FIND_FINANCIAL_REPORT_LIST.SET_GAJGDM_PARAM(SUBSTR(#{cityCode},1,8))=SUBSTR(#{cityCode},1,8)
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/FindStationCountMapper.xml
View file @ 9bf5fff5
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<result column="APPLY_COUNT" property="applyCount" jdbcType="NUMERIC"/> <result column="APPLY_COUNT" property="applyCount" jdbcType="NUMERIC"/>
</resultMap> </resultMap>
<select id="findStationCountByDealDate" resultType="java.util.HashMap"> <select id="findStationCountByDealDate" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM FIND_STATION_COUNT_BY_VIEW WHERE SUBMIT_DATE=#{submit_Date} SELECT * FROM FIND_STATE_COUNT_VIEW WHERE FIND_STATE_COUNT_LIST.SET_SUBMITDATE_PARAM(#{submitDate})=#{submitDate} AND FIND_STATE_COUNT_LIST.SET_STATE_PARAM(#{state})=#{state}
</select> </select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/FindTaskByDealdateViewMapper.xml
View file @ 9bf5fff5
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<result column="IMPORT_TIME" property="importTime" jdbcType="VARCHAR"/> <result column="IMPORT_TIME" property="importTime" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
<select id="findTaskByDealdateViewData" resultType="java.util.HashMap"> <select id="findTaskByDealdateViewData" resultType="java.util.HashMap" parameterType="String">
select * from FIND_TASK_BY_DEALDATE_VIEW SELECT * FROM FIND_TASK_BY_DEALDATE_VIEW WHERE FIND_TASK_BY_DEALDATE_LIST.SET_STARTTIME_PARAM(#{startTime})=#{startTime} AND FIND_TASK_BY_DEALDATE_LIST.SET_ENDTIME_PARAM(#{endTime})=#{endTime}
</select> </select>
......
src/main/resources/mapper/GroupNoMapper.xml
View file @ 9bf5fff5
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<resultMap id="GroupNoMapper" type="com.yxproject.start.entity.GroupNoEntity"> <resultMap id="GroupNoMapper" type="com.yxproject.start.entity.GroupNoEntity">
<id column="GROUP_NO" property="group_No" jdbcType="VARCHAR"/> <id column="GROUP_NO" property="group_No" jdbcType="VARCHAR"/>
<result column="TASK_ID" property="task_Id" jdbcType="NUMERIC"/> <result column="TASK_ID" property="task_Id" jdbcType="NUMERIC"/>
<result column="VAILD_COUNT" property="vaild_Count" jdbcType="NUMERIC"/> <result column="VALID_COUNT" property="valid_Count" jdbcType="NUMERIC"/>
<result column="INVALID_COUNT" property="invalid_Count" jdbcType="NUMERIC"/> <result column="INVALID_COUNT" property="invalid_Count" jdbcType="NUMERIC"/>
<result column="SPECIAL_CARD_COUNT" property="special_Card_Count" jdbcType="NUMERIC"/> <result column="SPECIAL_CARD_COUNT" property="special_Card_Count" jdbcType="NUMERIC"/>
</resultMap> </resultMap>
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
</select> </select>
<insert id="insertGroupNoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity"> <insert id="insertGroupNoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity">
Insert into GROUP_NO (GROUP_NO,task_Id,VAILD_COUNT,INVALID_COUNT,special_Card_Count) values Insert into GROUP_NO (GROUP_NO,task_Id,VALID_COUNT,INVALID_COUNT,special_Card_Count) values
(#{group_No},#{task_Id},#{vaild_Count},#{invalid_Count},#{special_Card_Count}) (#{group_No},#{task_Id},#{valid_Count},#{invalid_Count},#{special_Card_Count})
</insert> </insert>
<select id="findGroupNoEntityByAcceptNo" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String"> <select id="findGroupNoEntityByAcceptNo" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<update id="updateGroupinfoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity"> <update id="updateGroupinfoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity">
update GROUP_NO set group_No =#{group_No} update GROUP_NO set group_No =#{group_No}
<if test="task_Id">,task_Id =#{task_Id}</if> <if test="task_Id">,task_Id =#{task_Id}</if>
<if test="vaild_Count">,vaild_Count =#{vaild_Count}</if> <if test="valid_Count">,valid_Count =#{valid_Count}</if>
<if test="invalid_Count">,invalid_Count =#{invalid_Count}</if> <if test="invalid_Count">,invalid_Count =#{invalid_Count}</if>
<if test="special_Card_Count">,special_Card_Count =#{special_Card_Count}</if> <if test="special_Card_Count">,special_Card_Count =#{special_Card_Count}</if>
where group_No=#{group_No} where group_No=#{group_No}
...@@ -43,16 +43,14 @@ ...@@ -43,16 +43,14 @@
SELECT * FROM TABLE(find_normal_county_list.GET_county_infos(#{task_Id})) SELECT * FROM TABLE(find_normal_county_list.GET_county_infos(#{task_Id}))
</select> </select>
<select id="findGroupNoByTaskListID" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String"> <select id="findGroupListByTaskListId" resultType="com.yxproject.start.entity.GroupListEntity" parameterType="String">
SELECT * FROM GROUP_NO left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID where TASK_ID=#{task_Id} select GROUP_NO as groupNo,sum(VALID_COUNT) as validCount,sum(INVALID_COUNT) as invalidCount,sum(SPECIAL_CARD_COUNT) as specialCardCount from (select sum(VALID_COUNT),sum(INVALID_COUNT),sum(SPECIAL_CARD_COUNT),COUNT(GROUP_NO),TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT from GROUP_NO group by TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT ) GROUP_NO
left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID
where TASK.TASK_ID=#{task_Id}
group by GROUP_NO
</select> </select>
<select id="findGroupNoByTaskStateId" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
SELECT * FROM GROUP_NO left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID where TASK_STATE_ID=#{task_State_Id}
</select>
<select id="findGroupNoByCardType" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
SELECT * FROM GROUP_NO left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID where CARD_TYPE=#{card_type}
</select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/PoliceStationApplyReasonMapper.xml
View file @ 9bf5fff5
...@@ -33,24 +33,37 @@ ...@@ -33,24 +33,37 @@
SELECT * FROM TABLE(find_special_apply_reason_list.get_apply_reason_list(#{cyclesheetid})) SELECT * FROM TABLE(find_special_apply_reason_list.get_apply_reason_list(#{cyclesheetid}))
</select> </select>
<select id="findPoliceStationApplyReasonBySaveDate" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity"> <select id="findPoliceStationApplyReasonBySaveDate" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM POLICE_STATION_APPLY_REASON where SAVE_DATE=#{save_Data} SELECT * FROM POLICE_STATION_APPLY_REASON WHERE substr(TO_CHAR(SAVE_DATE,'yyyyMMdd'),0,8) >= #{startDate}
AND #{endDate} >= substr(TO_CHAR(SAVE_DATE,'yyyyMMdd'),0,8)
</select> </select>
<select id="findPoliceStationApplyReasonByCardType" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity"> <select id="findPoliceStationApplyReasonByCardType" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM POLICE_STATION_APPLY_REASON left join TASK on POLICE_STATION_APPLY_REASON.TASK_ID = TASK.TASK_ID where CARD_TYPE=#{card_Type} SELECT * FROM POLICE_STATION_APPLY_REASON left join TASK on POLICE_STATION_APPLY_REASON.TASK_ID = TASK.TASK_ID where CARD_TYPE=#{card_Type}
</select> </select>
<select id="findPoliceStationApplyReasonByCity" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity"> <select id="findPoliceStationApplyReasonByCity" resultType="java.util.HashMap" parameterType="String">
select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,5) left join CITY_DIC on CITY_DIC.CITYCODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,3) where CITYCODE=#{citycode} select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON
left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE
left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,1,6)
left join CITY_DIC on substr(CITY_DIC.CITYCODE,1,4) = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,1,4)
where substr(CITY_DIC.CITYCODE,1,4)=#{citycode}
</select> </select>
<select id="findPoliceStationApplyReasonByCounty" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity"> <select id="findPoliceStationApplyReasonByCounty" resultType="java.util.HashMap" parameterType="String">
select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,5) left join CITY_DIC on CITY_DIC.CITYCODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,3) where COUNTY_CODE=#{county_Code} select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON
left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE
left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,1,6)
left join CITY_DIC on substr(CITY_DIC.CITYCODE,1,4) = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,1,4)
where COUNTY_CODE=#{county_Code}
</select> </select>
<select id="findPoliceStationApplyReasonByPoliceStation" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity"> <select id="findPoliceStationApplyReasonByPoliceStation" resultType="java.util.HashMap" parameterType="String">
select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,5) left join CITY_DIC on CITY_DIC.CITYCODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,3) where POLICE_STATION_CODE=#{police_Station_Code} select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON
left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE
left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,1,6)
left join CITY_DIC on substr(CITY_DIC.CITYCODE,1,4) = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,1,4)
where POLICE_STATION_CODE=#{police_Station_Code}
</select> </select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/SpecialCardMapper.xml
View file @ 9bf5fff5
...@@ -30,4 +30,8 @@ ...@@ -30,4 +30,8 @@
select * from SPECIAL_CARD where GROUP_NO =#{group_No} select * from SPECIAL_CARD where GROUP_NO =#{group_No}
</select> </select>
<select id="findSpecialCardList" resultType="com.yxproject.start.entity.SpecialCardEntity" parameterType="String">
SELECT * FROM SPECIAL_CARD LEFT JOIN GROUP_NO ON GROUP_NO.GROUP_NO = SPECIAL_CARD.GROUP_NO WHERE GROUP_NO.GROUP_NO=#{group_No}
</select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/TaskMapper.xml
View file @ 9bf5fff5
...@@ -69,67 +69,34 @@ ...@@ -69,67 +69,34 @@
</select> </select>
<update id="replaceExceptionInformation" parameterType="com.yxproject.start.entity.TaskEntity" > <update id="replaceExceptionInformation" parameterType="com.yxproject.start.entity.TaskEntity" >
update TASK SET exception_Information = NULL,IS_EXCEPTION =#{is_Exception} where TASK_ID =#{task_Id} update TASK set exception_Information = NULL and IS_EXCEPTION =#{is_Exception} where TASK_ID =#{task_Id}
</update> </update>
<select id="totalNum" resultType="Integer"> <select id="totalNum" resultType="Integer">
select nvl(SUM(VAILD_COUNT),0) FROM GROUP_NO where TASK_ID =#{task_Id} select nvl(SUM(VALID_COUNT),0) FROM GROUP_NO
</select> </select>
<select id="findTypeListByTaskStateId" resultType="java.util.HashMap"> <update id="updateOutStorageDate" parameterType="String">
WITH update TASK SET OUT_STORAGE_DATE = SYSDATE where TASK_ID =#{task_Id}
t_Type_List </update>
AS(
select CARD_TYPE_ID,CARD_TYPE_DIC.CARD_TYPE from TASK left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = TASK.CARD_TYPE where TASK_STATE_ID=#{task_State_Id}
),
t_Count_Card_Type
AS(
select CARD_TYPE_ID, count(CARD_TYPE_ID) qty from t_Type_List group by CARD_TYPE_ID
)
SELECT t1.CARD_TYPE_ID,t1.CARD_TYPE ,nvl(t2.qty,0) FROM t_Type_List t1 left join t_Count_Card_Type t2 on t1.CARD_TYPE_ID = t2.CARD_TYPE_ID
</select> <update id="updateInStorageDate" parameterType="String">
update TASK SET IN_STORAGE_DATE = SYSDATE where TASK_ID =#{task_Id}
</update>
<select id="findCityListByCardType" resultType="java.util.HashMap"> <select id="findTypeListByTaskStateId" resultType="com.yxproject.start.entity.TypeListEntity" parameterType="String">
WITH SELECT TASK.CARD_TYPE AS typeCode,count(CARD_TYPE_ID) AS typeCount,CARD_TYPE_DIC.CARD_TYPE AS typeName FROM TASK
t_City_List left join (SELECT CARD_TYPE,count(CARD_TYPE_ID),CARD_TYPE_ID FROM CARD_TYPE_DIC GROUP BY CARD_TYPE,CARD_TYPE_ID) CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = TASK.CARD_TYPE
AS( where TASK_STATE_ID=#{task_State_Id}
select GROUP_NO.GROUP_NO,CITY_DIC.CITYNAME,GROUP_NO.VAILD_COUNT,GROUP_NO.INVALID_COUNT,TASK.CITYCODE from TASK left join GROUP_NO on GROUP_NO.TASK_ID = TASK.TASK_ID left join CITY_DIC on TASK.CITYCODE=CITY_DIC.CITYCODE where CARD_TYPE=#{card_Type} GROUP BY CARD_TYPE_DIC.CARD_TYPE,TASK.CARD_TYPE
),
t_Count_VAILD_COUNT
AS(
select VAILD_COUNT, count(VAILD_COUNT) qty1 from t_City_List group by VAILD_COUNT
),
t_Count_INVALID_COUNT
AS(
select INVALID_COUNT, count(INVALID_COUNT) qty2 from t_City_List group by INVALID_COUNT
),
t_Sum_VAILD_COUNT
AS(
select VAILD_COUNT, SUM(VAILD_COUNT) qty3 from t_City_List group by VAILD_COUNT
)
SELECT t1.GROUP_NO,t1.CITYNAME,t1.CITYCODE,t1.VAILD_COUNT,t1.INVALID_COUNT,nvl(t2.qty1,0),nvl(t3.qty2,0),nvl(t4.qty3,0) FROM t_City_List t1 left join t_Count_VAILD_COUNT t2 on t1.VAILD_COUNT = t2.VAILD_COUNT left join t_Count_INVALID_COUNT t3 on t1.INVALID_COUNT=t3.INVALID_COUNT left join t_Sum_VAILD_COUNT t4 on t1.VAILD_COUNT=t4.VAILD_COUNT
</select> </select>
<select id="findCityListByTaskStateId" resultType="java.util.HashMap"> <select id="findCityList" resultType="com.yxproject.start.entity.CityListEntity">
WITH SELECT CARD_TYPE,TASK.CITYCODE,CITYNAME AS cityName,sum(VALID_COUNT) AS validCount,sum(INVALID_COUNT) AS invalidCount,COUNT(GROUP_NO) AS groupCount,GROUP_NO AS groupNo,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID from (select sum(VALID_COUNT),sum(INVALID_COUNT),COUNT(GROUP_NO),TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT from GROUP_NO group by TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT ) GROUP_NO
t_City_List left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID
AS( left join (SELECT CITYCODE,CITYNAME FROM CITY_DIC) CITY_DIC on CITY_DIC.CITYCODE = TASK.CITYCODE
select GROUP_NO.GROUP_NO,CITY_DIC.CITYNAME,GROUP_NO.VAILD_COUNT,GROUP_NO.INVALID_COUNT,TASK.CITYCODE from TASK left join GROUP_NO on GROUP_NO.TASK_ID = TASK.TASK_ID left join CITY_DIC on TASK.CITYCODE=CITY_DIC.CITYCODE where TASK_STATE_ID=#{task_State_Id} where CARD_TYPE=#{cardType} and TASK_STATE_ID = #{taskStateId}
), GROUP BY CARD_TYPE,TASK.CITYCODE,CITYNAME,GROUP_NO,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID
t_Count_VAILD_COUNT
AS(
select VAILD_COUNT, count(VAILD_COUNT) qty1 from t_City_List group by VAILD_COUNT
),
t_Count_INVALID_COUNT
AS(
select INVALID_COUNT, count(INVALID_COUNT) qty2 from t_City_List group by INVALID_COUNT
),
t_Sum_VAILD_COUNT
AS(
select VAILD_COUNT, SUM(VAILD_COUNT) qty3 from t_City_List group by VAILD_COUNT
)
SELECT t1.GROUP_NO,t1.CITYNAME,t1.CITYCODE,t1.VAILD_COUNT,t1.INVALID_COUNT,nvl(t2.qty1,0),nvl(t3.qty2,0),nvl(t4.qty3,0) FROM t_City_List t1 left join t_Count_VAILD_COUNT t2 on t1.VAILD_COUNT = t2.VAILD_COUNT left join t_Count_INVALID_COUNT t3 on t1.INVALID_COUNT=t3.INVALID_COUNT left join t_Sum_VAILD_COUNT t4 on t1.VAILD_COUNT=t4.VAILD_COUNT
</select> </select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/static/dialogs/addFailedCard.html 0 → 100644
View file @ 9bf5fff5
<div class="ui-dialog-title">
特殊证件列表
</div>
<div class="ui-dialog-content">
<table>
<tr>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
<thead>
<th>受理号</th>
<th>类型</th>
</thead>
<tbody>
<tr ng-repeat="specialCard in specialCardList">
<td>{{specialCard.acceptNo}}</td>
<td ng-if="specialCard.specialType==0">余证</td>
<td ng-if="specialCard.specialType==1">快证</td>
<td ng-if="specialCard.specialType==2">退证</td>
</tr>
</tbody>
</table>
</td>
</tr>
</table>
</div>
src/main/resources/static/dialogs/addInStorage.html 0 → 100644
View file @ 9bf5fff5
<div>
<table class="table table-hover table-responsive" id="enterStoreTr">
<thead>
<th><input id="checkCkAllCountyBox" value="0" style="zoom:180%;vertical-align: bottom;" type="checkbox" ng-click="getAllCkCountyBox()"/>全选</th>
<th>循环单编号</th>
<th>区县</th>
<th>证件数量</th>
<th>已入库数量</th>
<th>入库数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="county in countyList | orderBy:countyCode">
<td><input type="checkbox" class="checkCkCountyBox" value="{{county.cycleSheetId}}_{{county.countyCode}}_0_{{county.electricSum- county.numberOfPutInStorage}}_0_0" style="zoom:180%;"/></td>
<td>{{county.cycleSheetId}}</td>
<td>{{county.countyName}}</td>
<td >{{county.electricSum}}</td>
<!--<td ng-if="county.numberOfPutInStorage==0">-->
<!--{{county.electricSum}}<i style="padding-left:15px;cursor: pointer;" class="glyphicon glyphicon-pencil" ng-click="updateEnterSum(county.countyCode)"></i>-->
<!--</td> -->
<!--<td ng-if="county.numberOfPutInStorage!=0">-->
<!--{{county.numberOfPutInStorage}}<i style="padding-left:15px;cursor: pointer;" class="glyphicon glyphicon-pencil" ng-click="updateEnterSum(county.countyCode)"></i>-->
<!--</td>-->
<td>
{{county.numberOfPutInStorage}}
</td>
<td >{{county.electricSum - county.numberOfPutInStorage}}<i style="padding-left:15px;cursor: pointer;" class="glyphicon glyphicon-pencil" ng-click="updateEnterSum(county.countyCode)"></i></td>
<td ng-show="showSum == county.countyCode">
<input type="text" ng-model="enterStoreSum">
<i style="cursor: pointer;" class="glyphicon glyphicon-ok" ng-click="saveEnterStoreSum(enterStoreSum,0,county.cycleSheetId,county.countyCode)">修改</i>
<i style="cursor: pointer;" class="glyphicon glyphicon-remove" ng-click="cancelEnterStoreSum()">取消</i>
</td>
</tr>
</tbody>
</table>
<div style="text-align: right;">
<div style="color: red;padding: 5px;" ng-if="showAlertCk">{{alertCk}}</div>
<div style="color: red;padding: 5px;" ng-if="showUpdateSuccessMsg">{{updateSuccessMsg}}</div>
<button class="btn btn-info" ng-click="saveTheseCountySum()">更新</button>
<button class="btn btn-info" ng-click="closeThisDialog()">关闭</button>
</div>
</div>
\ No newline at end of file
src/main/resources/static/dialogs/addOutStorage.html 0 → 100644
View file @ 9bf5fff5
<div>
<table class="table table-hover table-responsive" id="enterStoreTr">
<thead>
<th><input id="checkCkAllCountyBox" value="0" style="zoom:180%;vertical-align: bottom;" type="checkbox"
ng-click="getAllCkCountyBox()"/>全选
</th>
<th>循环单编号</th>
<th>区县</th>
<th>证件数量</th>
<th>已出库数量</th>
<th>出库数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="county in countyList | orderBy:countyCode">
<td><input type="checkbox" class="checkCkCountyBox"
value="{{county.cycleSheetId}}_{{county.countyCode}}_0_0_{{county.electricSum - county.numberOfOutbound}}_0"
style="zoom:180%;"/></td>
<td>{{county.cycleSheetId}}</td>
<td>{{county.countyName}}</td>
<td>{{county.electricSum}}</td>
<td>
{{county.numberOfOutbound}}
</td>
<td>{{county.electricSum - county.numberOfOutbound}}<i style="padding-left:15px;cursor: pointer;"
class="glyphicon glyphicon-pencil"
ng-click="updateLeaveSum(county.countyCode)"></i>
</td>
<td ng-show="showSum == county.countyCode">
<input type="text" ng-model="leaveStoreSum">
<i style="cursor: pointer;" class="glyphicon glyphicon-ok"
ng-click="saveLeaveStoreSum(leaveStoreSum,0,county.cycleSheetId,county.countyCode)">修改</i>
<i style="cursor: pointer;" class="glyphicon glyphicon-remove" ng-click="cancelLeaveStoreSum()">取消</i>
</td>
</tr>
</tbody>
</table>
<div style="text-align: right;">
<div style="color: red;padding: 5px;" ng-if="showAlertCk">{{alertCk}}</div>
<div style="color: red;padding: 5px;" ng-if="showUpdateSuccessMsg">{{updateSuccessMsg}}</div>
<button class="btn btn-info" ng-click="saveTheseCountySum()">更新</button>
<button class="btn btn-info" ng-click="closeThisDialog()">关闭</button>
</div>
</div>
\ No newline at end of file
src/main/resources/static/dialogs/addPermission.html
View file @ 9bf5fff5
<div class="ui-dialog-title"> <div class="ui-dialog-title">
添加权限 添加权限
</div> </div>
...@@ -6,21 +5,21 @@ ...@@ -6,21 +5,21 @@
<form name="form" class="form-validation"> <form name="form" class="form-validation">
<div class="form-group"> <div class="form-group">
<label>名称</label> <label>名称</label>
<input type="text" class="form-control" ng-model="name" required > <input type="text" class="form-control" ng-model="name" required>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>资源路径</label> <label>资源路径</label>
<input type="text" class="form-control" ng-model="url" required > <input type="text" class="form-control" ng-model="url" required>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>权限字符串</label> <label>权限字符串</label>
<input type="text" class="form-control" ng-model="permission" required > <input type="text" class="form-control" ng-model="permission" required>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>资源类型</label> <label>资源类型</label>
<div class="radio"> <div class="radio">
<label class="i-checks"> <label class="i-checks">
<input type="radio" ng-model="resourceType" value="menu"> <input type="radio" ng-model="resourceType" value="menu">
<i></i> <i></i>
menu menu
</label> </label>
......
src/main/resources/static/dialogs/addRole.html
View file @ 9bf5fff5
<div class="ui-dialog-title"> <div class="ui-dialog-title">
添加角色 添加角色
</div> </div>
...@@ -6,16 +5,17 @@ ...@@ -6,16 +5,17 @@
<form name="form" class="form-validation"> <form name="form" class="form-validation">
<div class="form-group"> <div class="form-group">
<label>角色名称</label> <label>角色名称</label>
<input type="text" class="form-control" ng-model="role" required > <input type="text" class="form-control" ng-model="role" required>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>角色描述</label> <label>角色描述</label>
<input type="text" class="form-control" ng-model="description" required > <input type="text" class="form-control" ng-model="description" required>
</div> </div>
<div class="form-group pull-in clearfix"> <div class="form-group pull-in clearfix">
<div class="col-sm-6"> <div class="col-sm-6">
<label>权限</label> <label>权限</label>
<select ui-jq="chosen" multiple class="form-control w-md" ng-model="permissionId" ng-options="perm.id as perm.name for perm in activePermissionList"></select> <select ui-jq="chosen" multiple class="form-control w-md" ng-model="permissionId"
ng-options="perm.id as perm.name for perm in activePermissionList"></select>
</div> </div>
</div> </div>
</form> </form>
......
src/main/resources/static/dialogs/addUser.html
View file @ 9bf5fff5
<div class="ui-dialog-title"> <div class="ui-dialog-title">
添加用户 添加用户
</div> </div>
...@@ -6,27 +5,29 @@ ...@@ -6,27 +5,29 @@
<form name="form" class="form-validation"> <form name="form" class="form-validation">
<div class="form-group"> <div class="form-group">
<label>用户名</label> <label>用户名</label>
<input type="text" class="form-control" ng-model="username" required > <input type="text" class="form-control" ng-model="username" required>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>昵称</label> <label>昵称</label>
<input type="text" class="form-control" ng-model="name" required > <input type="text" class="form-control" ng-model="name" required>
</div> </div>
<div class="form-group pull-in clearfix"> <div class="form-group pull-in clearfix">
<div class="col-sm-6"> <div class="col-sm-6">
<label>密码</label> <label>密码</label>
<input type="password" class="form-control" name="password" ng-model="password" required > <input type="password" class="form-control" name="password" ng-model="password" required>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<label>确认密码</label> <label>确认密码</label>
<input type="password" class="form-control" name="confirm_password" required ng-model="confirm_password" ui-validate=" '$value==password' " ui-validate-watch=" 'password' "> <input type="password" class="form-control" name="confirm_password" required ng-model="confirm_password"
ui-validate=" '$value==password' " ui-validate-watch=" 'password' ">
<span ng-show='form.confirm_password.$error.validator' style="color:red;">两次密码不一致！</span> <span ng-show='form.confirm_password.$error.validator' style="color:red;">两次密码不一致！</span>
</div> </div>
</div> </div>
<div class="form-group pull-in clearfix"> <div class="form-group pull-in clearfix">
<div class="col-sm-6"> <div class="col-sm-6">
<label>角色</label> <label>角色</label>
<select class="form-control w-md" ng-model="roleId" ng-options="role.id as role.role for role in activeRoleList"></select> <select class="form-control w-md" ng-model="roleId"
ng-options="role.id as role.role for role in activeRoleList"></select>
</div> </div>
</div> </div>
</form> </form>
......
src/main/resources/static/dialogs/alert.html
View file @ 9bf5fff5
<div class="ui-dialog-title">
<div class="ui-dialog-title"> 提示
提示 </div>
</div> <div class="ui-dialog-content">
<div class="ui-dialog-content"> <div>{{msgText}}</div>
<div>{{msgText}}</div> <div><span style="color: red">{{errText}}</span></div>
<div><span style="color: red">{{errText}}</span></div> </div>
</div> <div class="ui-dialog-confirm">
<div class="ui-dialog-confirm"> <button class="btn btn-info" ng-click="confirmYes()">确定</button>
<button class="btn btn-info" ng-click="confirmYes()">确定</button> </div>
</div>
src/main/resources/static/dialogs/specialCardList.html 0 → 100644
View file @ 9bf5fff5
<div class="ui-dialog-title">
特殊证件列表
</div>
<div class="ui-dialog-content">
<table>
<tr>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
<thead>
<th>受理号</th>
<th>类型</th>
</thead>
<tbody>
<tr ng-repeat="specialCard in specialCardList">
<td>{{specialCard.acceptNo}}</td>
<td ng-if="specialCard.specialType==0">余证</td>
<td ng-if="specialCard.specialType==1">快证</td>
<td ng-if="specialCard.specialType==2">退证</td>
</tr>
</tbody>
</table>
</td>
</tr>
</table>
</div>
src/main/resources/static/dialogs/updatePerms.html
View file @ 9bf5fff5
<div class="ui-dialog-title"> <div class="ui-dialog-title">
修改权限 修改权限
</div> </div>
...@@ -6,7 +5,7 @@ ...@@ -6,7 +5,7 @@
<form name="form" class="form-validation"> <form name="form" class="form-validation">
<div class="form-group"> <div class="form-group">
<label>名称</label> <label>名称</label>
<input type="text" class="form-control" ng-model="thisPerm.name" ng-value="thisPerm.name" required > <input type="text" class="form-control" ng-model="thisPerm.name" ng-value="thisPerm.name" required>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>路径</label> <label>路径</label>
...@@ -14,13 +13,14 @@ ...@@ -14,13 +13,14 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>权限字符串</label> <label>权限字符串</label>
<input type="text" class="form-control" ng-model="thisPerm.permission" ng-value="thisPerm.permission" required > <input type="text" class="form-control" ng-model="thisPerm.permission" ng-value="thisPerm.permission"
required>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>资源类型</label> <label>资源类型</label>
<div class="radio"> <div class="radio">
<label class="i-checks"> <label class="i-checks">
<input type="radio" ng-model="resourceType" value="menu"> <input type="radio" ng-model="resourceType" value="menu">
<i></i> <i></i>
menu menu
</label> </label>
......
src/main/resources/static/dialogs/updateRole.html
View file @ 9bf5fff5
<div class="ui-dialog-title"> <div class="ui-dialog-title">
修改角色 修改角色
</div> </div>
...@@ -6,16 +5,18 @@ ...@@ -6,16 +5,18 @@
<form name="form" class="form-validation"> <form name="form" class="form-validation">
<div class="form-group"> <div class="form-group">
<label>角色名称</label> <label>角色名称</label>
<input type="text" class="form-control" ng-value="thisRole.role" ng-model="thisRole.role" required > <input type="text" class="form-control" ng-value="thisRole.role" ng-model="thisRole.role" required>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>角色描述</label> <label>角色描述</label>
<input type="text" class="form-control" ng-value="thisRole.description" ng-model="thisRole.description" required > <input type="text" class="form-control" ng-value="thisRole.description" ng-model="thisRole.description"
required>
</div> </div>
<div class="form-group pull-in clearfix"> <div class="form-group pull-in clearfix">
<div class="col-sm-6"> <div class="col-sm-6">
<label>权限</label> <label>权限</label>
<select ui-jq="chosen" multiple class="form-control w-md" ng-model="permissionId" ng-options="perm.id as perm.name for perm in activePermissionList"></select> <select ui-jq="chosen" multiple class="form-control w-md" ng-model="permissionId"
ng-options="perm.id as perm.name for perm in activePermissionList"></select>
</div> </div>
</div> </div>
</form> </form>
......
src/main/resources/static/js/config.router.js
View file @ 9bf5fff5
...@@ -106,6 +106,42 @@ angular.module('app') ...@@ -106,6 +106,42 @@ angular.module('app')
}] }]
} }
}) })
.state('layout.searchSpecialCard', {
url: '/searchSpecialCard',
templateUrl: 'tpl/layout/searchSpecialCard/searchSpecialCard.html',
cache:false,
controller:'searchSpecialCardCtrl',
resolve: {
deps: ['uiLoad',
function( uiLoad ){
return uiLoad.load( ['tpl/layout/searchSpecialCard/searchSpecialCard.js'] );
}]
}
})
.state('layout.failedCard', {
url: '/failedCard',
templateUrl: 'tpl/layout/failedCard/failedCard.html',
cache:false,
controller:'failedCardCtrl',
resolve: {
deps: ['uiLoad',
function( uiLoad ){
return uiLoad.load( ['tpl/layout/failedCard/failedCard.js'] );
}]
}
})
.state('layout.receipt', {
url: '/receipt',
templateUrl: 'tpl/layout/receipt/receipt.html',
cache:false,
controller:'receiptCtrl',
resolve: {
deps: ['uiLoad',
function( uiLoad ){
return uiLoad.load( ['tpl/layout/receipt/receipt.js'] );
}]
}
})
} }
] ]
......
src/main/resources/static/js/services/service.js
View file @ 9bf5fff5
...@@ -380,7 +380,125 @@ app.service('MessageService', function (ngDialog) { ...@@ -380,7 +380,125 @@ app.service('MessageService', function (ngDialog) {
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"} var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA)) MessageService.httpRequestFailed(JSON.stringify(errA))
}) })
},
getTypeListByTaskStateId:function(state,success){
$http({
method: 'GET',
url: "../user/getTypeListByTaskStateId" + urlTimeStamp(),
params:{
taskStateId:state
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getCityListByCardType:function(cardType,state,success){
$http({
method: 'GET',
url: "../user/getCityListByCardType" + urlTimeStamp(),
params:{
state:state,
cardType:cardType
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getGroupNoByTaskListId:function(taskStateId,success){
$http({
method: 'GET',
url: "../user/getGroupNoByTaskListId" + urlTimeStamp(),
params:{
taskStateId:taskStateId
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getCountyListByTaskListId:function(taskStateId,success){
$http({
method: 'GET',
url: "../user/getCountyListByTaskListId" + urlTimeStamp(),
params:{
taskStateId:taskStateId
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
updateProductionTask:function(taskId,state,success){
$http({
method: 'GET',
url: "../user/updateProductionTask" + urlTimeStamp(),
params:{
taskId:taskId,
state:state
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
findFailedinfo:function(state,workShop,success){
$http({
method: 'GET',
url: "../user/findFailedinfo" + urlTimeStamp(),
params:{
workShop:workShop,
state:state
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getReceiptData:function(startTime, endTime,success){
$http({
method: 'GET',
url: "../user/getConnectList" + urlTimeStamp(),
params:{
startTime:startTime,
endTime:endTime
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getprintReceipt:function(startTime, endTime,success){
$http({
method: 'GET',
url: "../user/getConnectList" + urlTimeStamp(),
params:{
startTime:startTime,
endTime:endTime
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
} }
} }
}]) }])
\ No newline at end of file
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.html
View file @ 9bf5fff5
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</span> </span>
</div> </div>
</span> </span>
<span class="col-lg-1" style="margin-left: 1em"> <span class="col-lg-1" style="margin-left: 6em">
<button type="button" class="btn btn-primary" ng-click="task_click()">查询</button> <button type="button" class="btn btn-primary" ng-click="task_click()">查询</button>
</span> </span>
</div> </div>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<th>不合格</th> <th>不合格</th>
<th>机器号</th> <th>机器号</th>
<th>状态</th> <th>状态</th>
<th></th> <th>操作</th>
</thead> </thead>
<tbody ng-repeat="city in cityList| orderBy:citycode:desc"> <tbody ng-repeat="city in cityList| orderBy:citycode:desc">
<tr> <tr>
...@@ -73,33 +73,58 @@ ...@@ -73,33 +73,58 @@
ng-show="city.printer_Id!=null">机器<span>{{city.printer_Id}}</span></span> ng-show="city.printer_Id!=null">机器<span>{{city.printer_Id}}</span></span>
</td> </td>
<td>{{city.state}}</td> <td>{{city.state}}</td>
<td><a ng-click="showTable(city.task_Id)">组号列表</a></td> <td ng-if="userState<=4"><a ng-click="showTable(city.task_Id)">组号列表</a></td>
<td ng-if="userState>4"><a ng-click="showTable(city.task_Id)">区县列表</a></td>
<td><a ng-click="finishClick(city.task_Id,userState)">完成</a></td>
</tr> </tr>
<tr ng-show="showtable==city.task_Id"> <tr ng-show="showtable==city.task_Id && userState<=4">
<td></td> <td></td>
<td colspan="4"> <td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table"> <table style="font-size:0.9em;color: #000;" class="table">
<thead> <thead>
<th>组号</th> <th>组号</th>
<th>合格数量</th> <th>合格数量</th>
<th>不合格数量</th> <th>不合格数量</th>
<th></th> <th>特殊证件数量</th>
<th>特殊证件列表</th>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="groups in city.list"> <tr ng-repeat="group in groupList">
<td>{{groups.groupNo}}</td> <td>{{group.groupNO}}</td>
<td>{{groups.downloadCount}}</td> <td>{{group.vaildCount}}</td>
<td>{{groups.type}}</td> <td>{{group.invaildCount}}</td>
<td></td> <td>{{group.specialCardCount}}</td>
<td><a ng-click="showTableGroup(group.specialCardList)">特殊证件列表</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</td> </td>
</tr>
<tr ng-show="showtable==city.task_Id && userState>4">
<td></td> <td></td>
<td></td> <td colspan="4">
<td></td> <table style="font-size:0.9em;color: #000;" class="table">
<td></td> <thead>
<td></td> <th>区县名称</th>
<th>卸载数量</th>
<th>完成数量</th>
<th>电写入数量</th>
<th>出库数量</th>
<th>入库数量</th>
</thead>
<tbody>
<tr ng-repeat="county in countyList">
<td>{{county.countyName}}</td>
<td>{{county.downloadCount}}</td>
<td>{{county.finish_Count}}</td>
<td>{{county.electric_writerCount}}</td>
<td>{{county.out_Storage_Count}}</td>
<td>{{county.in_Storage_Count}}</td>
</tr>
</tbody>
</table>
</td>
</tr> </tr>
......
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.js
View file @ 9bf5fff5
app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage', function($scope,$rootScope, $http,$state, $filter,$localStorage) { app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, ngDialog) {
if($rootScope.loginData.login === false){ if ($rootScope.loginData.login === false) {
$state.go("signin") $state.go("signin")
}else { } else {
$state.go("layout.cycleSheet") $state.go("layout.cycleSheet")
} }
$scope.userState = $rootScope.loginData.state;
// $scope.userState=5;
var getNowFormatDate = function () { var getNowFormatDate = function () {
var date = new Date(); var date = new Date();
...@@ -16,10 +18,10 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi ...@@ -16,10 +18,10 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
if (strDate >= 0 && strDate <= 9) { if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate; strDate = "0" + strDate;
} }
var currentdate = date.getFullYear() + "/" + month +"/"+ strDate; var currentdate = date.getFullYear() + "/" + month + "/" + strDate;
return currentdate; return currentdate;
} }
$scope.today = function() { $scope.today = function () {
$scope.dt = getNowFormatDate(); $scope.dt = getNowFormatDate();
}; };
$scope.today(); $scope.today();
...@@ -29,16 +31,16 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi ...@@ -29,16 +31,16 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
}; };
// Disable weekend selection // Disable weekend selection
$scope.disabled = function(date, mode) { $scope.disabled = function (date, mode) {
return ( mode === 'day' && ( date.getDay() === 0 || date.getDay() === 6 ) ); return (mode === 'day' && (date.getDay() === 0 || date.getDay() === 6));
}; };
$scope.toggleMin = function() { $scope.toggleMin = function () {
$scope.minDate = $scope.minDate ? null : new Date(); $scope.minDate = $scope.minDate ? null : new Date();
}; };
$scope.toggleMin(); $scope.toggleMin();
$scope.open = function($event) { $scope.open = function ($event) {
$event.preventDefault(); $event.preventDefault();
$event.stopPropagation(); $event.stopPropagation();
...@@ -54,36 +56,278 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi ...@@ -54,36 +56,278 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
$scope.initDate = new Date('2016-15-20'); $scope.initDate = new Date('2016-15-20');
$scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate']; $scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
$scope.format = $scope.formats[1]; $scope.format = $scope.formats[1];
$scope.task_click = function(){ $scope.task_click = function () {
console.log($rootScope.loginData.state,"----测试-----",$scope.dt,"===="); console.log($rootScope.loginData.state, "----测试-----", $scope.dt, "====");
} }
$scope.check_type = function(typeCode){
console.log($rootScope.loginData.state,"----测试-----",$scope.dt,"====",typeCode,"+++++++++++++"); $scope.cardType = 0;
$scope.check_type = function (typeCode) {
cardType = typeCode;
console.log($rootScope.loginData.state, "----测试-----", $scope.dt, "====", typeCode, "+++++++++++++");
} }
$scope.typeList =[ // 查询制证类型列表
{typeCode:0,typeCount:5000,typeName:'普通证'}, var getTypeListData = function (state) {
{typeCode:1,typeCount:5000,typeName:'邮寄证'}, HttpService.getTypeListByTaskStateId(1,function (data) {
{typeCode:2,typeCount:5000,typeName:'特殊证'}, $scope.typeList = data.respData;
{typeCode:9,typeCount:5000,typeName:'异地证'}, console.log("---制证类型--数据源:")
] console.log(data.respData)
$scope.cityList =[
{"card_Type":1,"citycode":"410300",cityName:"郑州",groupCount:10,groupSum:1500,groupInvailedSum:15,groupNO:"1-25","download_Date":null,"exception_Information":"","in_Storage_Date":null,"is_Exception":0,"issued_Date":null,"old_Card_Type":1,"out_Storage_Date":null,"out_Workshop_Date":null,"position_Date":null,"print_Out_Date":null,"print_State":0,"printer_Id":0,"quality_People_Name":"","quality_Test_Date":null,"submit_Date":{"date":20,"day":2,"hours":11,"minutes":20,"month":10,"seconds":53,"time":1542684053000,"timezoneOffset":-480,"year":118},"task_Id":201811203,"task_State_Id":1}, })
{"card_Type":1,"citycode":"410400",cityName:"驻马店",groupCount:10,groupSum:2500,groupInvailedSum:16,groupNO:"26-45","download_Date":null,"exception_Information":"","in_Storage_Date":null,"is_Exception":0,"issued_Date":null,"old_Card_Type":1,"out_Storage_Date":null,"out_Workshop_Date":null,"position_Date":null,"print_Out_Date":null,"print_State":0,"printer_Id":0,"quality_People_Name":"","quality_Test_Date":null,"submit_Date":{"date":20,"day":2,"hours":11,"minutes":20,"month":10,"seconds":53,"time":1542684053000,"timezoneOffset":-480,"year":118},"task_Id":201811203,"task_State_Id":1}, }
{"card_Type":1,"citycode":"410500",cityName:"新乡",groupCount:10,groupSum:3500,groupInvailedSum:17,groupNO:"46","download_Date":null,"exception_Information":"","in_Storage_Date":null,"is_Exception":0,"issued_Date":null,"old_Card_Type":1,"out_Storage_Date":null,"out_Workshop_Date":null,"position_Date":null,"print_Out_Date":null,"print_State":0,"printer_Id":0,"quality_People_Name":"","quality_Test_Date":null,"submit_Date":{"date":20,"day":2,"hours":11,"minutes":20,"month":10,"seconds":53,"time":1542684053000,"timezoneOffset":-480,"year":118},"task_Id":201811203,"task_State_Id":1}, getTypeListData($rootScope.loginData.state);
{"card_Type":1,"citycode":"410600",cityName:"周口",groupCount:10,groupSum:3500,groupInvailedSum:18,groupNO:"48-52,53-55","download_Date":null,"exception_Information":"","in_Storage_Date":null,"is_Exception":0,"issued_Date":null,"old_Card_Type":1,"out_Storage_Date":null,"out_Workshop_Date":null,"position_Date":null,"print_Out_Date":null,"print_State":0,"printer_Id":0,"quality_People_Name":"","quality_Test_Date":null,"submit_Date":{"date":20,"day":2,"hours":11,"minutes":20,"month":10,"seconds":53,"time":1542684053000,"timezoneOffset":-480,"year":118},"task_Id":201811203,"task_State_Id":1},
// $scope.nowType == $scope.getCityListData[$scope.currentTab].typeCode? $scope.currentTab=$scope.currentTab:$scope.currentTab= -1;
// for (var i = 0; i < $scope.getCityListData.length; i++) {
//
// if (i == $scope.currentTab) {
// $scope.getCityListData[i].isActive = true;
// } else {
// $scope.getCityListData[i].isActive = false;
// }
// }
// // 查询城市列表
// var getCityListData = function (cardType,state) {
// HttpService.getCityListByCardType(cardType,1,function (data) {
// $scope.cityList = data.respData;
// console.log("---城市列表--数据源:")
// console.log(data.respData)
//
// })
// }
// getCityListData(cardType,$rootScope.loginData.state);
// // 查询组号列表
// var getGroupListData = function (taskId) {
// HttpService.getGroupNoByTaskListId(taskId,function (data) {
// $scope.groupList = data.respData;
// console.log("---查询组号列表--数据源:")
// console.log(data.respData)
//
// })
// }
// // 查询区县列表
// var getCountyListData = function (taskId) {
// HttpService.getCountyListByTaskListId(taskId,function (data) {
// $scope.countyList = data.respData;
// console.log("---查询区县列表--数据源:")
// console.log(data.respData)
//
// })
// }
// $scope.typeList = [
// {typeCode: 0, typeCount: 5000, typeName: '普通证'},
// {typeCode: 1, typeCount: 5000, typeName: '邮寄证'},
// {typeCode: 2, typeCount: 5000, typeName: '特殊证'},
// {typeCode: 9, typeCount: 5000, typeName: '异地证'}
// ]
$scope.cityList = [
{
"card_Type": 1,
"citycode": "410300",
cityName: "郑州",
groupCount: 10,
groupSum: 1500,
groupInvailedSum: 15,
groupNO: "1-25",
"download_Date": null,
"exception_Information": "",
"in_Storage_Date": null,
"is_Exception": 0,
"issued_Date": null,
"old_Card_Type": 1,
"out_Storage_Date": null,
"out_Workshop_Date": null,
"position_Date": null,
"print_Out_Date": null,
"print_State": 0,
"printer_Id": 0,
"quality_People_Name": "",
"quality_Test_Date": null,
"submit_Date": {
"date": 20,
"day": 2,
"hours": 11,
"minutes": 20,
"month": 10,
"seconds": 53,
"time": 1542684053000,
"timezoneOffset": -480,
"year": 118
},
"task_Id": 201811203,
"task_State_Id": 1
},
{
"card_Type": 1,
"citycode": "410400",
cityName: "驻马店",
groupCount: 10,
groupSum: 2500,
groupInvailedSum: 16,
groupNO: "26-45",
"download_Date": null,
"exception_Information": "",
"in_Storage_Date": null,
"is_Exception": 0,
"issued_Date": null,
"old_Card_Type": 1,
"out_Storage_Date": null,
"out_Workshop_Date": null,
"position_Date": null,
"print_Out_Date": null,
"print_State": 0,
"printer_Id": 0,
"quality_People_Name": "",
"quality_Test_Date": null,
"submit_Date": {
"date": 20,
"day": 2,
"hours": 11,
"minutes": 20,
"month": 10,
"seconds": 53,
"time": 1542684053000,
"timezoneOffset": -480,
"year": 118
},
"task_Id": 201811204,
"task_State_Id": 1
},
{
"card_Type": 1,
"citycode": "410500",
cityName: "新乡",
groupCount: 10,
groupSum: 3500,
groupInvailedSum: 17,
groupNO: "46",
"download_Date": null,
"exception_Information": "",
"in_Storage_Date": null,
"is_Exception": 0,
"issued_Date": null,
"old_Card_Type": 1,
"out_Storage_Date": null,
"out_Workshop_Date": null,
"position_Date": null,
"print_Out_Date": null,
"print_State": 0,
"printer_Id": 0,
"quality_People_Name": "",
"quality_Test_Date": null,
"submit_Date": {
"date": 20,
"day": 2,
"hours": 11,
"minutes": 20,
"month": 10,
"seconds": 53,
"time": 1542684053000,
"timezoneOffset": -480,
"year": 118
},
"task_Id": 201811205,
"task_State_Id": 1
},
{
"card_Type": 1,
"citycode": "410600",
cityName: "周口",
groupCount: 10,
groupSum: 3500,
groupInvailedSum: 18,
groupNO: "48-52,53-55",
"download_Date": null,
"exception_Information": "",
"in_Storage_Date": null,
"is_Exception": 0,
"issued_Date": null,
"old_Card_Type": 1,
"out_Storage_Date": null,
"out_Workshop_Date": null,
"position_Date": null,
"print_Out_Date": null,
"print_State": 0,
"printer_Id": 0,
"quality_People_Name": "",
"quality_Test_Date": null,
"submit_Date": {
"date": 20,
"day": 2,
"hours": 11,
"minutes": 20,
"month": 10,
"seconds": 53,
"time": 1542684053000,
"timezoneOffset": -480,
"year": 118
},
"task_Id": 201811206,
"task_State_Id": 1
},
] ]
$scope.groupList =[ $scope.groupList = [
{"groupNO":45,"vaildCount":45,invaildCount:25,specialCardCount:5,specialCardList:[{acceptNo:20180401,specialType:1},{acceptNo:20180401,specialType:1}]}, {
{"groupNO":45,"vaildCount":45,invaildCount:25,specialCardCount:5,specialCardList:[{acceptNo:20180401,specialType:1},{acceptNo:20180401,specialType:1}]}, "groupNO": 45,
{"groupNO":45,"vaildCount":45,invaildCount:25,specialCardCount:5,specialCardList:[{acceptNo:20180401,specialType:1},{acceptNo:20180401,specialType:1}]} "vaildCount": 45,
] invaildCount: 25,
specialCardCount: 5,
specialCardList: [{acceptNo: 20180401, specialType: 1}, {acceptNo: 20180401, specialType: 1}]
},
{
"groupNO": 45,
"vaildCount": 45,
invaildCount: 25,
specialCardCount: 5,
specialCardList: [{acceptNo: 20180401, specialType: 1}, {acceptNo: 20180401, specialType: 1}]
},
{
"groupNO": 45,
"vaildCount": 45,
invaildCount: 25,
specialCardCount: 5,
specialCardList: [{acceptNo: 20180401, specialType: 1}, {acceptNo: 20180401, specialType: 1}]
}
]
$scope.countyList = [ $scope.countyList = [
{} {
"countyName": "许昌县",
county_Code: "411023",
downloadCount: 240,
electric_writerCount: 240,
in_Storage_Count: 240,
out_Storage_Count: 240,
finish_Count: 240
},
{
"countyName": "禹州",
county_Code: "411081",
downloadCount: 210,
electric_writerCount: 210,
in_Storage_Count: 210,
out_Storage_Count: 210,
finish_Count: 210
},
{
"countyName": "长葛",
county_Code: "411082",
downloadCount: 243,
electric_writerCount: 243,
in_Storage_Count: 243,
out_Storage_Count: 243,
finish_Count: 243
}
] ]
$scope.receiptList = [[358, 0, 0, 0, 82, 0, 0, 1, 0, 205, 646, 3, "郑州 辖区", "410101"], [721, 0, 0, 0, 20, 0, 0, 7, 1, 91, 840, 4, "郑州 中原", "410102"],]
$scope.showtable = -1; $scope.showtable = -1;
$scope.showTableDY = function (taskID) { $scope.showTable = function (taskID) {
if ($scope.showtable != taskID) { if ($scope.showtable != taskID) {
$scope.showtable = taskID; $scope.showtable = taskID;
} else { } else {
...@@ -91,25 +335,47 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi ...@@ -91,25 +335,47 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
} }
} }
$scope.showTableGroup = function (specialCardList) {
ngDialog.open({
template: 'dialogs/specialCardList.html' + urlTimeStamp(),
width: 800,
cache: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService, $rootScope) {
$scope.specialCardList = specialCardList;
}]
})
}
$scope.finishClick = function (taskId, userState) {
HttpService.updateProductionTask(taskId, userState, function (data) {
//点击确认成功后 再次查询城市列表
getCityListData(cardType, $rootScope.loginData.state);
})
}
$scope.folds = [ $scope.folds = [
{id:1,name: '普通证', count:10000,filter:'',isActive:true, dataTable:{ {
id: 1, name: '普通证', count: 10000, filter: '', isActive: true, dataTable: {
"aaData": [ "aaData": [
{ {
"engine": "Trident", "engine": "Trident",
"browser": "Internet Explorer 4.0", "browser": "Internet Explorer 4.0",
"platform": "Win 95+", "platform": "Win 95+",
"version": "4", "version": "4",
"grade": "X" "grade": "X"
}, },
{ {
"engine": "Trident", "engine": "Trident",
"browser": "Internet Explorer 5.0", "browser": "Internet Explorer 5.0",
"platform": "Win 95+", "platform": "Win 95+",
"version": "5", "version": "5",
"grade": "C" "grade": "C"
}] }]
}}, }
{id:2,name: '邮寄证', count:20000,filter:'starred', dataTable:{ },
{
id: 2, name: '邮寄证', count: 20000, filter: 'starred', dataTable: {
"aaData": [ "aaData": [
{ {
"engine": "Trident", "engine": "Trident",
...@@ -132,63 +398,68 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi ...@@ -132,63 +398,68 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
"version": "7", "version": "7",
"grade": "A" "grade": "A"
}] }]
}}, }
{id:3,name: '军人证', count:32000,filter:'sent', dataTable:{ },
"aaData": [ {
{ id: 3, name: '军人证', count: 32000, filter: 'sent', dataTable: {
"engine": "Trident", "aaData": [
"browser": "Internet Explorer 5.5", {
"platform": "Win 95+", "engine": "Trident",
"version": "5.5", "browser": "Internet Explorer 5.5",
"grade": "A" "platform": "Win 95+",
}] "version": "5.5",
}}, "grade": "A"
{id:4,name: '快证', count:40,filter:'important', dataTable:{ }]
"aaData": [ }
{ },
"engine": "Webkit", {
"browser": "Safari 1.3", id: 4, name: '快证', count: 40, filter: 'important', dataTable: {
"platform": "OSX.3", "aaData": [
"version": "312.8", {
"grade": "A" "engine": "Webkit",
}, "browser": "Safari 1.3",
{ "platform": "OSX.3",
"engine": "Webkit", "version": "312.8",
"browser": "Safari 2.0", "grade": "A"
"platform": "OSX.4+", },
"version": "419.3", {
"grade": "A" "engine": "Webkit",
}, "browser": "Safari 2.0",
{ "platform": "OSX.4+",
"engine": "Webkit", "version": "419.3",
"browser": "Safari 3.0", "grade": "A"
"platform": "OSX.4+", },
"version": "522.1", {
"grade": "A" "engine": "Webkit",
}, "browser": "Safari 3.0",
{ "platform": "OSX.4+",
"engine": "Webkit", "version": "522.1",
"browser": "OmniWeb 5.5", "grade": "A"
"platform": "OSX.4+", },
"version": "420", {
"grade": "A" "engine": "Webkit",
}, "browser": "OmniWeb 5.5",
{ "platform": "OSX.4+",
"engine": "Webkit", "version": "420",
"browser": "iPod Touch / iPhone", "grade": "A"
"platform": "iPod", },
"version": "420.1", {
"grade": "A" "engine": "Webkit",
}] "browser": "iPod Touch / iPhone",
}} "platform": "iPod",
"version": "420.1",
"grade": "A"
}]
}
}
]; ];
$scope.currentTab = 1; $scope.currentTab = 1;
$scope.func = function (id) { $scope.func = function (id) {
for (var i=0;i<$scope.folds.length;i++){ for (var i = 0; i < $scope.folds.length; i++) {
if(id == $scope.folds[i].id){ if (id == $scope.folds[i].id) {
$scope.folds[i].isActive = true; $scope.folds[i].isActive = true;
}else{ } else {
$scope.folds[i].isActive = false; $scope.folds[i].isActive = false;
} }
} }
......
src/main/resources/static/tpl/layout/failedCard/failedCard.html 0 → 100644
View file @ 9bf5fff5
<div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }">
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light "
ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<div class="hbox hbox-auto-xs hbox-auto-sm">
<div class="col w-md bg-light dk b-r bg-auto">
<div class="wrapper b-b bg">
<button class="btn btn-sm btn-default pull-right visible-sm visible-xs" ui-toggle-class="show"
target="#email-menu"><i class="fa fa-bars"></i></button>
<a class="w-xs font-bold">废证任务单</a>
</div>
</div>
<div class="col">
<div class="wrapper-md">
<div class="panel panel-default">
<div class="panel-heading">
废证任务
</div>
<div class="table-responsive">
<table class="table table-striped b-t b-light">
<thead>
<th>废证受理号</th>
<th>循环单号</th>
<th>废证原因</th>
<th>打印时间</th>
<th>分配时间</th>
<th>预订位时间</th>
<th>状态</th>
<th>操作</th>
</thead>
<tbody ng-repeat="failedCard in failedCardList">
<tr>
<td>{{failedCard.acceptNo}}</td>
<td>{{failedCard.taskID}}</td>
<td>{{failedCard.failedCardReason}}</td>
<td>{{failedCard.printDate}}</td>
<td>
<span style="padding-left:10px;"
ng-show="failedCard.allotDate==null">未分配</span>
<span style="padding-left:10px;"
ng-show="failedCard.allotDate!=null">{{failedCard.allotDate}}}</span></span>
</td>
<td>{{failedCard.positionDate}}</td>
<td>{{failedCard.state}}</td>
<td><a ng-click="finishClick(failedCard.failedCardId,userState)">完成</a></td>
</tr>
</tbody>
</table>
</div>
<footer class="panel-footer">
<div class="row">
<div class="col-sm-4 text-right text-center-xs">
<ul class="pagination pagination-sm m-t-none m-b-none">
<li><a href><i class="fa fa-chevron-left"></i></a></li>
<li><a href>1</a></li>
<li><a href>2</a></li>
<li><a href>3</a></li>
<li><a href>4</a></li>
<li><a href>5</a></li>
<li><a href><i class="fa fa-chevron-right"></i></a></li>
</ul>
</div>
</div>
</footer>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/tpl/layout/failedCard/failedCard.js 0 → 100644
View file @ 9bf5fff5
app.controller('failedCardCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, ngDialog) {
if ($rootScope.loginData.login === false) {
$state.go("signin")
} else {
$state.go("layout.failedCard")
}
$scope.userState = $rootScope.loginData.state;
var getNowFormatDate = function () {
var date = new Date();
var month = date.getMonth() + 1;
var strDate = date.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = date.getFullYear() + "/" + month + "/" + strDate;
return currentdate;
}
$scope.today = function () {
$scope.dt = getNowFormatDate();
};
$scope.today();
$scope.clear = function () {
$scope.dt = null;
};
$scope.disabled = function (date, mode) {
return (mode === 'day' && (date.getDay() === 0 || date.getDay() === 6));
};
$scope.toggleMin = function () {
$scope.minDate = $scope.minDate ? null : new Date();
};
$scope.toggleMin();
$scope.open = function ($event) {
$event.preventDefault();
$event.stopPropagation();
$scope.opened = true;
};
$scope.dateOptions = {
formatYear: 'yy',
startingDay: 1,
class: 'datepicker'
};
$scope.initDate = new Date('2016-15-20');
$scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
$scope.format = $scope.formats[1];
$scope.task_click = function () {
console.log($rootScope.loginData.state, "----测试-----", $scope.dt, "====");
}
$scope.cardType = 0;
$scope.check_type = function (typeCode) {
cardType = typeCode;
console.log($rootScope.loginData.state, "----测试-----", $scope.dt, "====", typeCode, "+++++++++++++");
}
// // 查询废证列表
// var getFailedCardListData = function (state,workshop) {
// HttpService.findFailedinfo(1,workshop,function (data) {
// $scope.failedCardList = data.respData;
// console.log("---制证类型--数据源:")
// console.log(data.respData)
//
// })
// }
// getFailedCardListData($rootScope.loginData.state,$rootScope.loginData.workshop);
$scope.failedCardList = [
{
"acceptNo": "201802",
"failedCardReason": "切废",
failedCardId: 201811205,
taskID: 201811203,
positionDate: "20181108",
finishDate: "20181109",
allotDate: "20181203",
printDate: "20181204",
state: 2
},
{
"acceptNo": "2018035",
"failedCardReason": "电写入废",
failedCardId: 201811206,
taskID: 201811204,
positionDate: "20181108",
finishDate: "20181109",
allotDate: "20181203",
printDate: "20181204",
state: 2
},
{
"acceptNo": "2018036",
"failedCardReason": "冲切废",
failedCardId: 201811207,
taskID: 201811205,
positionDate: "20181108",
finishDate: "20181109",
allotDate: "20181203",
printDate: "20181204",
state: 2
}
]
$scope.finishClick = function (taskId, userState) {
HttpService.updateProductionTask(taskId, userState, function (data) {
//点击确认成功后 再次废证列表
getFailedCardListData($rootScope.loginData.state, $rootScope.loginData.workshop);
})
}
$scope.folds = [
{
id: 1, name: '普通证', count: 10000, filter: '', isActive: true, dataTable: {
"aaData": [
{
"engine": "Trident",
"browser": "Internet Explorer 4.0",
"platform": "Win 95+",
"version": "4",
"grade": "X"
},
{
"engine": "Trident",
"browser": "Internet Explorer 5.0",
"platform": "Win 95+",
"version": "5",
"grade": "C"
}]
}
},
{
id: 2, name: '邮寄证', count: 20000, filter: 'starred', dataTable: {
"aaData": [
{
"engine": "Trident",
"browser": "Internet Explorer 5.5",
"platform": "Win 95+",
"version": "5.5",
"grade": "A"
},
{
"engine": "Trident",
"browser": "Internet Explorer 6",
"platform": "Win 98+",
"version": "6",
"grade": "A"
},
{
"engine": "Trident",
"browser": "Internet Explorer 7",
"platform": "Win XP SP2+",
"version": "7",
"grade": "A"
}]
}
},
{
id: 3, name: '军人证', count: 32000, filter: 'sent', dataTable: {
"aaData": [
{
"engine": "Trident",
"browser": "Internet Explorer 5.5",
"platform": "Win 95+",
"version": "5.5",
"grade": "A"
}]
}
},
{
id: 4, name: '快证', count: 40, filter: 'important', dataTable: {
"aaData": [
{
"engine": "Webkit",
"browser": "Safari 1.3",
"platform": "OSX.3",
"version": "312.8",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "Safari 2.0",
"platform": "OSX.4+",
"version": "419.3",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "Safari 3.0",
"platform": "OSX.4+",
"version": "522.1",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "OmniWeb 5.5",
"platform": "OSX.4+",
"version": "420",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "iPod Touch / iPhone",
"platform": "iPod",
"version": "420.1",
"grade": "A"
}]
}
}
];
$scope.currentTab = 1;
$scope.func = function (id) {
for (var i = 0; i < $scope.folds.length; i++) {
if (id == $scope.folds[i].id) {
$scope.folds[i].isActive = true;
} else {
$scope.folds[i].isActive = false;
}
}
$scope.currentTab = id;
}
}]);
\ No newline at end of file
src/main/resources/static/tpl/layout/layout.html
View file @ 9bf5fff5
<!-- navbar --> <!-- navbar -->
<div class="app-header navbar"> <div class="app-header navbar">
<!-- navbar header --> <!-- navbar header -->
<div class="navbar-header {{app.settings.navbarHeaderColor}}"> <div class="navbar-header {{app.settings.navbarHeaderColor}}">
<button class="pull-right visible-xs dk" ui-toggle-class="show" data-target=".navbar-collapse"> <button class="pull-right visible-xs dk" ui-toggle-class="show" data-target=".navbar-collapse">
<i class="glyphicon glyphicon-cog"></i> <i class="glyphicon glyphicon-cog"></i>
</button> </button>
<button class="pull-right visible-xs" ui-toggle-class="off-screen" data-target=".app-aside" ui-scroll="app"> <button class="pull-right visible-xs" ui-toggle-class="off-screen" data-target=".app-aside" ui-scroll="app">
<i class="glyphicon glyphicon-align-justify"></i> <i class="glyphicon glyphicon-align-justify"></i>
</button> </button>
<!-- brand --> <!-- brand -->
<a href="#/" class="navbar-brand text-lt"> <a href="#/" class="navbar-brand text-lt">
<i class="fa fa-credit-card"></i> <i class="fa fa-credit-card"></i>
<span class="hidden-folded m-l-xs">{{app.name}}</span> <span class="hidden-folded m-l-xs">{{app.name}}</span>
</a> </a>
<!-- / brand --> <!-- / brand -->
</div> </div>
<!-- / navbar header --> <!-- / navbar header -->
<!-- navbar collapse --> <!-- navbar collapse -->
<div class="collapse pos-rlt navbar-collapse box-shadow {{app.settings.navbarCollapseColor}}"> <div class="collapse pos-rlt navbar-collapse box-shadow {{app.settings.navbarCollapseColor}}">
<!-- buttons --> <!-- buttons -->
<div class="nav navbar-nav hidden-xs"> <div class="nav navbar-nav hidden-xs">
<a href class="btn no-shadow navbar-btn" ng-click="app.settings.asideFolded = !app.settings.asideFolded"> <a href class="btn no-shadow navbar-btn" ng-click="app.settings.asideFolded = !app.settings.asideFolded">
<i class="fa {{app.settings.asideFolded ? 'fa-indent' : 'fa-dedent'}} fa-fw"></i> <i class="fa {{app.settings.asideFolded ? 'fa-indent' : 'fa-dedent'}} fa-fw"></i>
</a> </a>
</div>
<!-- / buttons -->
<!-- search form -->
<form class="navbar-form navbar-form-sm navbar-left shift" ui-shift="prependTo" target=".navbar-collapse" role="search" ng-controller="TypeaheadDemoCtrl">
<div class="form-group">
<div class="input-group">
<input type="text" ng-model="selected" typeahead="state for state in states | filter:$viewValue | limitTo:8" class="form-control input-sm bg-light no-border rounded padder" placeholder="Search projects...">
<span class="input-group-btn">
<button type="submit" class="btn btn-sm bg-light rounded"><i class="fa fa-search"></i></button>
</span>
</div>
</div> </div>
</form> <!-- / buttons -->
<!-- / search form -->
<!-- nabar right --> <!-- search form -->
<ul class="nav navbar-nav navbar-right"> <form class="navbar-form navbar-form-sm navbar-left shift" ui-shift="prependTo" target=".navbar-collapse"
<li class="hidden-xs"> role="search" ng-controller="TypeaheadDemoCtrl">
<a ui-fullscreen></a> <div class="form-group">
</li> <div class="input-group">
<li class="dropdown" dropdown> <input type="text" ng-model="selected"
<a href class="dropdown-toggle clear" dropdown-toggle> typeahead="state for state in states | filter:$viewValue | limitTo:8"
<span class="thumb-sm avatar pull-right m-t-n-sm m-b-n-sm m-l-sm"> class="form-control input-sm bg-light no-border rounded padder"
<img src="../img/a0.jpg" alt="..."> placeholder="Search projects...">
<i class="on md b-white bottom"></i> <span class="input-group-btn">
</span> <button type="submit" class="btn btn-sm bg-light rounded">
<span class="hidden-sm hidden-md">{{loginData.username}}</span> <b class="caret"></b> <i class="fa fa-search"></i>
</a> </button>
<!-- dropdown --> </span>
<ul class="dropdown-menu animated fadeInRight w"> </div>
<li> </div>
<a ng-click="logout()">Logout</a> </form>
<!-- / search form -->
<!-- nabar right -->
<ul class="nav navbar-nav navbar-right">
<li class="hidden-xs">
<a ui-fullscreen></a>
</li>
<li class="dropdown" dropdown>
<a href class="dropdown-toggle clear" dropdown-toggle>
<span class="thumb-sm avatar pull-right m-t-n-sm m-b-n-sm m-l-sm">
<img src="../img/a0.jpg" alt="...">
<i class="on md b-white bottom"></i>
</span>
<span class="hidden-sm hidden-md">{{loginData.username}}</span>
<b class="caret"></b>
</a>
<!-- dropdown -->
<ul class="dropdown-menu animated fadeInRight w">
<li>
<a ng-click="logout()">Logout</a>
</li>
</ul>
<!-- / dropdown -->
</li> </li>
</ul> </ul>
<!-- / dropdown --> <!-- / navbar right -->
</li>
</ul>
<!-- / navbar right -->
</div> </div>
<!-- / navbar collapse --> <!-- / navbar collapse -->
</div> </div>
<!-- / navbar --> <!-- / navbar -->
<!-- menu --> <!-- menu -->
<div class="app-aside hidden-xs {{app.settings.asideColor}}"> <div class="app-aside hidden-xs {{app.settings.asideColor}}">
<div class="aside-wrap"> <div class="aside-wrap">
<!-- if you want to use a custom scroll when aside fixed, use the slimScroll <!-- if you want to use a custom scroll when aside fixed, use the slimScroll
<div class="navi-wrap" ui-jq="slimScroll" ui-options="{height:'100%', size:'8px'}"> <div class="navi-wrap" ui-jq="slimScroll" ui-options="{height:'100%', size:'8px'}">
--> -->
<div class="navi-wrap"> <div class="navi-wrap">
<!-- nav --> <!-- nav -->
<nav ui-nav class="navi"> <nav ui-nav class="navi">
<!-- list --> <!-- list -->
<ul class="nav"> <ul class="nav">
<li class="hidden-folded padder m-t m-b-sm text-muted text-xs"> <li class="hidden-folded padder m-t m-b-sm text-muted text-xs">
<span>导航</span> <span>导航</span>
</li> </li>
<li ui-sref-active="active" ng-repeat="menu in menuList"> <li ui-sref-active="active" ng-repeat="menu in menuList">
<a ui-sref="{{menu.url}}"> <a ui-sref="{{menu.url}}">
<i class="{{icons[$index]}}"></i> <i class="{{icons[$index]}}"></i>
<span class="font-bold" >{{menu.name}}</span> <span class="font-bold">{{menu.name}}</span>
</a> </a>
</li> </li>
<li class="line dk"></li> <li class="line dk"></li>
</ul> </ul>
<!-- / list --> <!-- / list -->
</nav> </nav>
<!-- nav --> <!-- nav -->
</div> </div>
</div> </div>
</div> </div>
<!-- / menu --> <!-- / menu -->
<!-- view --> <!-- view -->
<div class="app-content" ng-class="{'m-n': app.hideAside, 'h-full': app.hideFooter }"> <div class="app-content" ng-class="{'m-n': app.hideAside, 'h-full': app.hideFooter }">
<div ui-view></div> <div ui-view></div>
</div> </div>
<!-- / view --> <!-- / view -->
<!-- footer --> <!-- footer -->
<div class="app-footer wrapper b-t bg-white"> <div class="app-footer wrapper b-t bg-white">
<span class="pull-right">version:{{app.version}}</span> <span class="pull-right">version:{{app.version}}</span>
&copy; 2018 Copyright. &copy; 2018 Copyright.
</div> </div>
<!-- / footer --> <!-- / footer -->
\ No newline at end of file \ No newline at end of file
src/main/resources/static/tpl/layout/layout.js
View file @ 9bf5fff5
app.controller('layOutCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage','HttpService', function($scope,$rootScope, $http,$state, $filter,$localStorage,HttpService) { app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService) {
if ($rootScope.loginData.login == false) {
if($rootScope.loginData.login == false){
$state.go("signin") $state.go("signin")
}else{ } else {
$scope.logout = function(){ $scope.logout = function () {
HttpService.logout(function(data) {}) HttpService.logout(function (data) {
})
$state.go("signin") $state.go("signin")
localStorage.removeItem("ngStorage-loginData"); localStorage.removeItem("ngStorage-loginData");
location.reload(); location.reload();
......
src/main/resources/static/tpl/layout/permissionList/permissionList.html
View file @ 9bf5fff5
<div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }"> <div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }">
<!-- hbox layout --> <!-- hbox layout -->
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light " ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;"> <div class="hbox hbox-auto-xs hbox-auto-sm bg-light "
ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<div style="padding: 20px;" class="layui-anim layui-anim-up"> <div style="padding: 20px;" class="layui-anim layui-anim-up">
<xblock> <xblock>
<button class="layui-btn" ng-click="addPerms()"><i class="layui-icon" ></i>添加</button> <button class="layui-btn" ng-click="addPerms()"><i class="layui-icon"></i>添加</button>
</xblock> </xblock>
<table class="layui-table"> <table class="layui-table">
<thead> <thead>
<tr> <tr>
<th>ID</th> <th>ID</th>
<th>权限</th> <th>权限</th>
<th>名称</th> <th>名称</th>
<th>路径</th> <!--<th>路径</th>-->
<th>类型</th> <th>类型</th>
<!--<th>父类id</th>--> <!--<th>父类id</th>-->
<!--<th>父类id树</th>--> <!--<th>父类id树</th>-->
<th>状态</th> <th>状态</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="permission in permissionList | orderBy:id track by permission.id"> <tr ng-repeat="permission in permissionList | orderBy:id track by permission.id">
<td>{{permission.id}}</td> <td>{{permission.id}}</td>
<td>{{permission.permission}}</td> <td>{{permission.permission}}</td>
<td>{{permission.name}}</td> <td>{{permission.name}}</td>
<td>{{permission.url}}</td> <!--<td>{{permission.url}}</td>-->
<td>{{permission.resource_type}}</td> <td>{{permission.resource_type}}</td>
<!--<td>{{permission.parent_id}}</td>--> <!--<td>{{permission.parent_id}}</td>-->
<!--<td>{{permission.parent_ids}}</td>--> <!--<td>{{permission.parent_ids}}</td>-->
<td class="td-status"> <td class="td-status">
<span ng-if="permission.available==1" class="layui-btn layui-btn-normal layui-btn-mini layui-btn-disabled">已停用</span> <span ng-if="permission.available==1"
<span ng-if="permission.available==0" class="layui-btn layui-btn-normal layui-btn-mini">已启用</span> class="layui-btn layui-btn-normal layui-btn-mini layui-btn-disabled">已停用</span>
</td> <span ng-if="permission.available==0"
<td> class="layui-btn layui-btn-normal layui-btn-mini">已启用</span>
<a class="layui-btn layui-btn" ng-click="updatePerms(permission.id)">修改</a> </td>
<a class="layui-btn layui-btn-danger" ng-if="permission.available==0" ng-click="permissionDel(permission.id)">删除</a> <td>
<a class="layui-btn layui-btn-info" ng-if="permission.available==1" ng-click="permissionOpen(permission.id)">启用</a> <a class="layui-btn layui-btn" ng-click="updatePerms(permission.id)">修改</a>
</td> <a class="layui-btn layui-btn-danger" ng-if="permission.available==0"
</tr> ng-click="permissionDel(permission.id)">删除</a>
</tbody> <a class="layui-btn layui-btn-info" ng-if="permission.available==1"
</table> ng-click="permissionOpen(permission.id)">启用</a>
</td>
</tr>
</tbody>
</table>
</div> </div>
</div> </div>
<!-- /hbox layout --> <!-- /hbox layout -->
</div> </div>
\ No newline at end of file
src/main/resources/static/tpl/layout/permissionList/permissionList.js
View file @ 9bf5fff5
app.controller('permissionListCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage','HttpService','ngDialog', app.controller('permissionListCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog',
function($scope,$rootScope, $http,$state, $filter,$localStorage,HttpService,ngDialog) { function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, ngDialog) {
if($rootScope.loginData.login === false){ if ($rootScope.loginData.login === false) {
$state.go("signin") $state.go("signin")
}else { } else {
$state.go("layout.permissionList") $state.go("layout.permissionList")
} }
$scope.id = 'id'; $scope.id = 'id';
var getPermissionList = function(){ var getPermissionList = function () {
HttpService.getPermissionListData(function(data) { HttpService.getPermissionListData(function (data) {
$scope.permissionList = data; $scope.permissionList = data;
console.log($scope.permissionList); console.log($scope.permissionList);
}) })
} }
getPermissionList(); getPermissionList();
// 删除权限 // 删除权限
$scope.permissionDel = function(id){ $scope.permissionDel = function (id) {
HttpService.delPermission(id,function(data){ HttpService.delPermission(id, function (data) {
getPermissionList(); getPermissionList();
}) })
} }
// 启用权限 // 启用权限
$scope.permissionOpen = function(id){ $scope.permissionOpen = function (id) {
HttpService.openPermission(id,function(data){ HttpService.openPermission(id, function (data) {
getPermissionList(); getPermissionList();
}) })
} }
// 添加 // 添加
$scope.addPerms = function(){ $scope.addPerms = function () {
ngDialog.open({ ngDialog.open({
template: 'dialogs/addPermission.html' + urlTimeStamp(), template: 'dialogs/addPermission.html' + urlTimeStamp(),
width:800, width: 800,
cache: false, cache: false,
closeByDocument:false, closeByDocument: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) { controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
$scope.permissionAdd = function(resourceType){ $scope.permissionAdd = function (resourceType) {
var permission={}; var permission = {};
permission.name=$scope.name; permission.name = $scope.name;
permission.url=$scope.url; permission.url = $scope.url;
permission.permission=$scope.permission; permission.permission = $scope.permission;
permission.resourceType=resourceType; permission.resourceType = resourceType;
console.log(permission) console.log(permission)
HttpService.addPermission(permission,function(data){ HttpService.addPermission(permission, function (data) {
$scope.closeThisDialog(); $scope.closeThisDialog();
getPermissionList(); getPermissionList();
})
}
}]
})
}
// 修改
$scope.updatePerms = function (id) {
ngDialog.open({
template: 'dialogs/updatePerms.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getPermsById(id, function (data) {
$scope.thisPerm = data.permission;
console.log($scope.thisPerm)
}) })
} $scope.permUpdate = function (resourceType) {
}] var jsonPerm = {};
}) jsonPerm.id = $scope.thisPerm.id;
} jsonPerm.name = $scope.thisPerm.name;
// 修改 // jsonPerm.url=$scope.thisPerm.url;
$scope.updatePerms = function(id){ jsonPerm.permission = $scope.thisPerm.permission;
ngDialog.open({ jsonPerm.resourceType = resourceType;
template: 'dialogs/updatePerms.html' + urlTimeStamp(), console.log(jsonPerm)
width:800, HttpService.updatePerm(jsonPerm, function (data) {
cache: false, $scope.closeThisDialog();
closeByDocument:false, getPermissionList();
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) { })
HttpService.getPermsById(id,function(data){ }
$scope.thisPerm = data.permission; }]
console.log($scope.thisPerm)
})
$scope.permUpdate = function(resourceType){
var jsonPerm = {};
jsonPerm.id = $scope.thisPerm.id;
jsonPerm.name=$scope.thisPerm.name;
jsonPerm.url=$scope.thisPerm.url;
jsonPerm.permission =$scope.thisPerm.permission;
jsonPerm.resourceType=resourceType;
console.log(jsonPerm)
HttpService.updatePerm(jsonPerm,function(data){
$scope.closeThisDialog();
getPermissionList();
})
}
}]
}) })
} }
}]) }])
\ No newline at end of file \ No newline at end of file
src/main/resources/static/tpl/layout/receipt/receipt.html 0 → 100644
View file @ 9bf5fff5
<div class="row" style="font-size: 1.3em;border-bottom:1px solid #CCCCCC;margin-bottom:10px;padding-top:10px;">
<div class="col-md-1">
<div>交接单</div>
</div>
<div class="col-md-11" style="text-align: right;">
<div style="width: auto">
<span>起始时间：</span>
<input type="text" ng-model="nowDataEight" value="currentDetailDate" id="wdate1" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm',autoPickDate:'true'})">
<span>结束时间：</span>
<input type="text" ng-model="nowDate" value="currentDetailDate" id="wdate2" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm',autoPickDate:'true'})">
<input type="submit" class="btn btn-primary" value="查询" ng-click="myClick()">
</div>
</div>
</div>
<div class="loading">
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
</div>
</div>
<div style="padding: 10px;background-color: #fff;border: 1px solid #CCC;border-radius: 10px;">
<div>
<div ng-if="receiptData.length>0">
<table class="table table-hover" style="margin-top:10px;">
<thead>
<th></th>
<th>普通证</th>
<!--<th><a ng-click="showSpecialCardInfo()">快证</a></th>-->
<th>快证</th>
<th>异地KS邮</th>
<th>异地KS普</th>
<th>异地邮</th>
<th>异地普</th>
<th>军人证</th>
<th>KS普</th>
<th>KS邮</th>
<th>邮寄证</th>
<th>小计</th>
<th>盒数</th>
</thead>
<tbody>
<tr ng-repeat="county in receiptData">
<td width="100px">{{county[12]}}</td>
<td width="100px" ng-repeat="item in county track by $index" ng-if="$index!=12 && $index!=13">
<span ng-if="item!=0">{{item}}</span>
<span ng-if="item==0"></span>
</td>
</tr>
</tbody>
</table>
</div>
<div ng-if="receiptData.length==0" style="font-size:1.5em;">
当天暂无报表数据。
</div>
<div ng-if="receiptData.length!=0 && receiptData[0][11] != 0" style="font-size:1.5em;">
<input type="button" class="btn btn-primary" value="下载交接单" ng-click="printReceipt()">
<input type="button" class="btn btn-primary" value="下载回执单" ng-click="printOfficialReceipt()">
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/tpl/layout/receipt/receipt.js 0 → 100644
View file @ 9bf5fff5
app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, $ngDialog) {
if ($rootScope.loginData.login === false) {
$state.go("signin")
} else {
$state.go("layout.receipt")
}
$scope.date = "date";
//获得当前年月日
var getNowFormatDetailDate = function () {
var date = new Date();
var month = date.getMonth() + 1;
var strDate = date.getDate();
var strHours = date.getHours();
var strMin = date.getMinutes();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
if (strHours >= 0 && strHours <= 9) {
strHours = "0" + strHours;
}
if (strMin >= 0 && strMin <= 9) {
strMin = "0" + strMin;
}
var currentdate = date.getFullYear() + "" + month + strDate + strHours + strMin;
return currentdate;
}
$scope.currentDetailDate = getNowFormatDetailDate();
$scope.nowDataEight = new Date().format("yyyy-MM-dd 08:00")
$scope.nowDate = new Date().format("yyyy-MM-dd hh:mm");
var changeDataFormat = function (date) {
var yyyyMMdd = date.split(" ")[0];
var hhmm = date.split(" ")[1];
var yyyy = yyyyMMdd.split("-")[0];
var MM = yyyyMMdd.split("-")[1];
var dd = yyyyMMdd.split("-")[2];
var hh = hhmm.split(":")[0];
var mm = hhmm.split(":")[1];
return yyyy + MM + dd + hh + mm;
}
var getReceiptData = function (startTime, endTime) {
HttpService.getReceiptData(startTime, endTime, function (data) {
$scope.receiptData = data.respData;
console.log($scope.receiptData)
})
}
getReceiptData(changeDataFormat($scope.nowDataEight), changeDataFormat($scope.nowDate))
$scope.myClick = function () {
var date1 = $("#wdate1").val();
var date2 = $("#wdate2").val();
console.log(changeDataFormat(date1))
console.log(changeDataFormat(date2))
getReceiptData(changeDataFormat(date1), changeDataFormat(date2))
}
$scope.printReceipt = function () {
var date1 = $("#wdate1").val();
var date2 = $("#wdate2").val();
HttpService.getprintReceipt(changeDataFormat(date1), changeDataFormat(date2), function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
document.body.appendChild(a);
a.href = URL.createObjectURL(blob);
a.click();
})
}
//下载回执单
$scope.printOfficialReceipt = function () {
var date1 = $("#wdate1").val();
var date2 = $("#wdate2").val();
HttpService.getPrintOfficialReceipt(changeDataFormat(date1), changeDataFormat(date2), function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
document.body.appendChild(a);
a.href = URL.createObjectURL(blob);
a.click();
})
}
}]);
\ No newline at end of file
src/main/resources/static/tpl/layout/roleList/roleList.html
View file @ 9bf5fff5
<div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }"> <div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }">
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light " ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;"> <div class="hbox hbox-auto-xs hbox-auto-sm bg-light "
ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<div style="padding: 20px;" class="layui-anim layui-anim-up"> <div style="padding: 20px;" class="layui-anim layui-anim-up">
<xblock> <xblock>
<button class="layui-btn" ng-click="addRole()"><i class="layui-icon"></i>添加</button> <button class="layui-btn" ng-click="addRole()"><i class="layui-icon"></i>添加</button>
</xblock> </xblock>
<table class="layui-table"> <table class="layui-table">
<thead> <thead>
<tr> <tr>
<th>ID</th> <th>ID</th>
<th>角色名</th> <th>角色名</th>
<th>描述</th> <th>描述</th>
<th>权限</th> <th>权限</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="role in roleList | orderBy:id track by role.id"> <tr ng-repeat="role in roleList | orderBy:id track by role.id">
<td>{{role.id}}</td> <td>{{role.id}}</td>
<td>{{role.role}}</td> <td>{{role.role}}</td>
<td>{{role.description}}</td> <td>{{role.description}}</td>
<td> <td>
<span ng-repeat="permission in role.permissions"> <span ng-repeat="permission in role.permissions">
{{permission.name}}, {{permission.name}},
</span> </span>
</td> </td>
<td> <td>
<a class="layui-btn layui-btn" ng-click="updateRoles(role.id)">修改</a> <a class="layui-btn layui-btn" ng-click="updateRoles(role.id)">修改</a>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
src/main/resources/static/tpl/layout/roleList/roleList.js
View file @ 9bf5fff5
app.controller('roleListCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage','HttpService','ngDialog', app.controller('roleListCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog',
function($scope,$rootScope, $http,$state, $filter,$localStorage,HttpService,ngDialog){ function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, ngDialog) {
if($rootScope.loginData.login === false){ if ($rootScope.loginData.login === false) {
$state.go("signin") $state.go("signin")
}else { } else {
$state.go("layout.roleList") $state.go("layout.roleList")
} }
$scope.id = 'id'; $scope.id = 'id';
var getRoleList = function(){ var getRoleList = function () {
HttpService.getRoleListData(function(data) { HttpService.getRoleListData(function (data) {
$scope.roleList = data; $scope.roleList = data;
console.log($scope.roleList); console.log($scope.roleList);
}) })
} }
getRoleList(); getRoleList();
$scope.addRole = function(){ $scope.addRole = function () {
ngDialog.open({ ngDialog.open({
template: 'dialogs/addRole.html' + urlTimeStamp(), template: 'dialogs/addRole.html' + urlTimeStamp(),
width:600, width: 600,
cache: false, cache: false,
closeByDocument:false, closeByDocument: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) { controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getAllActivePermissionList(function(data) { HttpService.getAllActivePermissionList(function (data) {
$scope.activePermissionList = data; $scope.activePermissionList = data;
})
$scope.roleAdd = function(permissionId){
var permission={};
permission.role=$scope.role;
permission.description=$scope.description;
permission.permissionIds=permissionId;
console.log(permission)
HttpService.rolesAdd(permission,function(data){
$scope.closeThisDialog();
getRoleList();
}) })
} $scope.roleAdd = function (permissionId) {
var permission = {};
permission.role = $scope.role;
permission.description = $scope.description;
permission.permissionIds = permissionId;
console.log(permission)
HttpService.rolesAdd(permission, function (data) {
$scope.closeThisDialog();
getRoleList();
})
}
}] }]
}) })
} }
$scope.updateRoles = function(id){ $scope.updateRoles = function (id) {
ngDialog.open({ ngDialog.open({
template: 'dialogs/updateRole.html' + urlTimeStamp(), template: 'dialogs/updateRole.html' + urlTimeStamp(),
width:800, width: 800,
cache: false, cache: false,
closeByDocument:false, closeByDocument: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) { controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getRoleById(id,function(data){ HttpService.getRoleById(id, function (data) {
$scope.thisRole = data.role; $scope.thisRole = data.role;
console.log($scope.thisRole) console.log($scope.thisRole)
})
HttpService.getAllActivePermissionList(function(data) {
$scope.activePermissionList = data;
})
$scope.roleUpdate = function(permissionId){
var jsonRole = {};
jsonRole.oldPermissionIds=[];
jsonRole.role=$scope.thisRole.role;
jsonRole.roleId =$scope.thisRole.id;
jsonRole.description =$scope.thisRole.description;
for (var i=0;i<$scope.thisRole.permissions.length;i++){
jsonRole.oldPermissionIds.push($scope.thisRole.permissions[i].id);
}
jsonRole.permissionId=permissionId;
console.log(jsonRole)
HttpService.updateRole(jsonRole,function(data){
$scope.closeThisDialog();
getRoleList();
}) })
} HttpService.getAllActivePermissionList(function (data) {
}] $scope.activePermissionList = data;
})
$scope.roleUpdate = function (permissionId) {
var jsonRole = {};
jsonRole.oldPermissionIds = [];
jsonRole.role = $scope.thisRole.role;
jsonRole.roleId = $scope.thisRole.id;
jsonRole.description = $scope.thisRole.description;
for (var i = 0; i < $scope.thisRole.permissions.length; i++) {
jsonRole.oldPermissionIds.push($scope.thisRole.permissions[i].id);
}
jsonRole.permissionId = permissionId;
console.log(jsonRole)
HttpService.updateRole(jsonRole, function (data) {
$scope.closeThisDialog();
getRoleList();
})
}
}]
}) })
} }
}]) }])
\ No newline at end of file \ No newline at end of file
src/main/resources/static/tpl/layout/searchSpecialCard/searchSpecialCard.html 0 → 100644
View file @ 9bf5fff5
<div id="mask-loading" class="mask-loading" ng-if="loading" style="background-color: rgba(0, 0, 0, 0.17);">
<div class="loading">
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
</div>
</div>
<div>
<div class="row"
style="font-size: 1.3em;border-bottom:1px solid #CCCCCC;font-weight: bold;margin-bottom:10px;padding-top:10px;">
<div class="col-md-6" style="text-align: left;cursor:pointer;"><a ng-click="goBack()"> << 完成返回</a></div>
<div class="col-md-6" style="text-align: right;padding-bottom:10px;">搜索结果</div>
</div>
<h3 ng-show="specialCardInfo== null&&searchInput!=null">没有找到与 "{{searchInput}}" 相关的信息。</h3>
<h3 ng-show="searchInput==null">请在快速搜索框中填写身份证号/受理号，查询相关信息。</h3>
<div style="width: auto">
<div ng-if="specialCardInfo[0].isGroup==0">
<div class="panel panel-default" ng-if="specialCardInfo[1]!=null">
<div class="panel-heading">
<h3 class="panel-title">
{{specialCardInfo[1].cycleSheetInfo}}
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>编号</th>
<th>地市</th>
<th>制证类型</th>
<th>日期</th>
<th>工序</th>
<th>操作时间</th>
<th>机器号</th>
<th>制证车间</th>
<th>质检</th>
<th>出库时间</th>
<th>入库时间</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[1].info[9]}}</td>
<td>{{specialCardInfo[1].info[14]}}</td>
<td>{{specialCardInfo[1].info[6]}}</td>
<td>{{specialCardInfo[1].info[1]|myDateFilter}}</td>
<td>{{specialCardInfo[1].info[7]}}</td>
<td>{{specialCardInfo[1].info[4]}}</td>
<td>{{specialCardInfo[1].info[16]}}</td>
<td ng-if="specialCardInfo[1].info[2]=='p1'">平一</td>
<td ng-if="specialCardInfo[1].info[2]=='p2'">平二</td>
<td>{{specialCardInfo[1].info[15]}}</td>
<td ng-if="specialCardInfo[1].info[12]!=null">{{specialCardInfo[1].info[12] |
myDateFilter}}
</td>
<td ng-if="specialCardInfo[1].info[13]!=null">{{specialCardInfo[1].info[12] |
myDateFilter}}
</td>
<td ng-if="specialCardInfo[1].info[12]==null"></td>
<td ng-if="specialCardInfo[1].info[13]==null"></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
{{specialCardInfo[0].database}}
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>地市</th>
<th ng-show="specialCardInfo[0].oldGroupNo!=null">受理号</th>
<th>姓名</th>
<th ng-show="specialCardInfo[0].makeName!=null">制证类型</th>
<th>身份证号</th>
<th>性别</th>
<th>出生日期</th>
<th>签发机关</th>
<th>起始有效期</th>
<th>终止有效期</th>
<th>证件状态</th>
<th>上报受理单位</th>
<th>证件状态</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].sbdw}}</td>
<td ng-show="specialCardInfo[0].oldGroupNo!=null">
{{specialCardInfo[0].oldGroupNo}}
</td>
<td>{{specialCardInfo[0].name}}</td>
<td ng-show="specialCardInfo[0].makeType!=null">{{specialCardInfo[0].makeName}}</td>
<td>{{specialCardInfo[0].IDcard}}</td>
<td>{{specialCardInfo[0].xb}}</td>
<td>{{specialCardInfo[0].csrq | myDateFilter}}</td>
<td>{{specialCardInfo[0].jfjg}}</td>
<td>{{specialCardInfo[0].yxqqsrq}}</td>
<td>{{specialCardInfo[0].yxqjzrq}}</td>
<td>{{specialCardInfo[0].state}}</td>
<td>{{specialCardInfo[0].sbdw}}</td>
<td ng-if="specialCardInfo[0].type==0">废证</td>
<td ng-if="specialCardInfo[0].type==1">快证</td>
<td ng-if="specialCardInfo[0].type==2">余证</td>
<td ng-if="specialCardInfo[0].type==3">退证</td>
</tr>
</tbody>
</table>
</div>
<div class="col-lg-12">
<div style="float: right;width: auto">
<button ng-if="(specialCardInfo[0].type==99||specialCardInfo[0].type ==0||specialCardInfo[0].type ==2||specialCardInfo[0].type ==4 )&& loginData.state==1"
class="btn btn-primary" id="addBtn"
ng-click="createCycleSheet(specialCardInfo[0].state,specialCardInfo[0].oldGroupNo,specialCardInfo[0].type,specialCardInfo[0].cityCode,specialCardInfo[0].createDate,specialCardInfo[0].makeType)">
添加特证
</button>
<button ng-if="(specialCardInfo[0].type ==1||specialCardInfo[0].type ==3) && loginData.state==1"
disabled class="btn btn-primary">添加特证
</button>
<button ng-if="(specialCardInfo[0].type==99||specialCardInfo[0].type ==0||specialCardInfo[0].type ==2||specialCardInfo[0].type ==1|| specialCardInfo[0].type ==4) && loginData.state==1"
class="btn btn-danger" id="returnBtn"
ng-click="returnCard(specialCardInfo[0].oldGroupNo)">退证
</button>
<button ng-if="specialCardInfo[0].type ==3 && loginData.state==1" disabled
class="btn btn-danger">退证
</button>
</div>
</div>
</div>
</div>
</div>
<div class="panel panel-default" ng-if="specialCardInfo[1].info[11]==1">
<div class="panel-heading">
<h3 class="panel-title">
异常信息
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
{{specialCardInfo[1].info[10]}}
</div>
</div>
</div>
</div>
</div>
<div ng-if="specialCardInfo[0].isGroup==1">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
{{specialCardInfo[0].library}}
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>组号</th>
<th>证件类型</th>
<th>地域</th>
<th>循环单生成时间</th>
<th>工序</th>
<th>转入制证库时间</th>
<th>打印卸载时间</th>
<th>电写入时间</th>
<th>电质检时间</th>
<th>生产车间</th>
<th>机器号</th>
<th>出库时间</th>
<th>入库时间</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].groupNo}}</td>
<td>{{specialCardInfo[0].info[5]}}</td>
<td>{{specialCardInfo[0].info[5]}}</td>
<td>{{specialCardInfo[0].info[3]}}</td>
<td>{{specialCardInfo[0].info[6]}}</td>
<td>{{specialCardInfo[0].info[7]}}</td>
<td>{{specialCardInfo[0].info[8]}}</td>
<td>{{specialCardInfo[0].info[9]}}</td>
<td>{{specialCardInfo[0].info[10]}}</td>
<td ng-if="specialCardInfo[0].info[12]=='p1'">平一车间</td>
<td ng-if="specialCardInfo[0].info[12]=='p2'">平二车间</td>
<td ng-if="specialCardInfo[0].info[12]==null">未分配</td>
<td>{{specialCardInfo[0].info[11]}}</td>
<td>{{specialCardInfo[0].info[16]| limitTo:8}}</td>
<td>{{specialCardInfo[0].info[17]| limitTo:8}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">
<div class="panel-heading">
<h3 class="panel-title">
异常信息
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
{{specialCardInfo[0].info[14]}}
</div>
</div>
</div>
</div>
</div>
<div ng-if="specialCardInfo[0].isGroup==3">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
{{specialCardInfo[0].library}}
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>组号</th>
<th>原文件名</th>
<th>证件类型</th>
<th>循环单生成时间</th>
<th>循环单所处工序</th>
<th>装库时间</th>
<th>出库时间</th>
<th>入库时间</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].groupNo}}</td>
<td>{{specialCardInfo[0].info[12]}}</td>
<td>{{specialCardInfo[0].info[5]}}</td>
<td>{{specialCardInfo[0].info[4]}}</td>
<td>{{specialCardInfo[0].info[6]}}</td>
<td>{{specialCardInfo[0].info[7]}}</td>
<td>{{specialCardInfo[0].info[16]| limitTo:8}}</td>
<td>{{specialCardInfo[0].info[17]| limitTo:8}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">
<div class="panel-heading">
<h3 class="panel-title">
异常信息
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
{{specialCardInfo[0].info[14]}}
</div>
</div>
</div>
</div>
</div>
<div ng-if="specialCardInfo[0].isGroup==4">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
{{specialCardInfo[0].library}}
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>循环单流水号</th>
<th>组号</th>
<th>制证类型</th>
<th>时间</th>
<th>工序</th>
<th>打印机器</th>
<th>制证车间</th>
<th>质检人</th>
<th>出库时间</th>
<th>入库时间</th>
<th>异常</th>
<th ng-if="specialCardInfo[0].info[12]==1">异常信息</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].info[1]}}</td>
<td>{{specialCardInfo[0].groupNo}}</td>
<td>{{specialCardInfo[0].info[5]}}</td>
<td>{{specialCardInfo[0].info[3]}}</td>
<td>{{specialCardInfo[0].info[6]}}</td>
<td>{{specialCardInfo[0].info[8]}}</td>
<td ng-if="specialCardInfo[0].info[9]=='p1'">平一车间</td>
<td ng-if="specialCardInfo[0].info[9]=='p2'">平二车间</td>
<td ng-if="specialCardInfo[0].info[9]==null">未分配</td>
<td>{{specialCardInfo[0].info[10]}}</td>
<td>{{specialCardInfo[0].info[13] | limitTo:8}}</td>
<td>{{specialCardInfo[0].info[14] | limitTo:8}}</td>
<td ng-if="specialCardInfo[0].info[12]==0">无</td>
<td ng-if="specialCardInfo[0].info[12]==1" style="color:red;">异常</td>
<td ng-if="specialCardInfo[0].info[12]==1">{{specialCardInfo[0].info[11]}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">
<div class="panel-heading">
<h3 class="panel-title">
异常信息
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
{{specialCardInfo[0].info[14]}}
</div>
</div>
</div>
</div>
</div>
<div ng-if="specialCardInfo[0].isGroup==5">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
{{specialCardInfo[0].library}}
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>组号</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].groupNo}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<div ng-if="specialCardInfo[0].isGroup==6">
<div class="panel panel-default" ng-if="specialCardInfo[0]!=null">
<div class="panel-heading">
<h3 class="panel-title">
{{specialCardInfo[0].cycleSheetInfo}}
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>编号</th>
<th>地市</th>
<th>制证类型</th>
<th>日期</th>
<!--<th>最后修改日期</th>-->
<th>工序</th>
<th>操作时间</th>
<th>机器号</th>
<th>制证车间</th>
<th>质检</th>
<th>出库时间</th>
<th>入库时间</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].info[9]}}</td>
<td>{{specialCardInfo[0].info[14]}}</td>
<td>{{specialCardInfo[0].info[6]}}</td>
<td>{{specialCardInfo[0].info[1]|myDateFilter}}</td>
<td>{{specialCardInfo[0].info[7]}}</td>
<td>{{specialCardInfo[0].info[4]}}</td>
<td>{{specialCardInfo[0].info[16]}}</td>
<td ng-if="specialCardInfo[0].info[2]=='p1'">平一</td>
<td ng-if="specialCardInfo[0].info[2]=='p2'">平二</td>
<td>{{specialCardInfo[0].info[15]}}</td>
<td ng-if="specialCardInfo[0].info[12]!=null">{{specialCardInfo[1].info[12] |
myDateFilter}}
</td>
<td ng-if="specialCardInfo[0].info[13]!=null">{{specialCardInfo[1].info[12] |
myDateFilter}}
</td>
<td ng-if="specialCardInfo[0].info[12]==null"></td>
<td ng-if="specialCardInfo[0].info[13]==null"></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<div ng-if="specialCardInfo[0].isGroup==8">
<!--循环单-->
<div class="panel panel-default" ng-if="specialCardInfo[0].cyclesheet.length>0">
<div class="panel-heading">
<h3 class="panel-title">
循环单
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0 15px 0 15px;">
<table class="table">
<thead>
<th>循环单流水号</th>
<th>组号</th>
<th>地市</th>
<th>制证类型</th>
<th>创建日期</th>
<th>工序</th>
<th>最后修改时间</th>
<th>机器号</th>
<th>制证车间</th>
<th>预定位接收时间</th>
<th>质检人</th>
<th>出库时间</th>
<th>入库时间</th>
<th>异常</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].cyclesheet[0]}}</td>
<td>{{specialCardInfo[0].cyclesheet[1]}}</td>
<td>{{specialCardInfo[0].cyclesheet[2]}}</td>
<td>{{specialCardInfo[0].cyclesheet[3]}}</td>
<td>{{specialCardInfo[0].cyclesheet[4]}}</td>
<td>{{specialCardInfo[0].cyclesheet[5]}}</td>
<td>{{specialCardInfo[0].cyclesheet[6]}}</td>
<td>{{specialCardInfo[0].cyclesheet[7]}}</td>
<td ng-if="specialCardInfo[0].cyclesheet[8]=='p1'||specialCardInfo[0].cyclesheet[8]=='p3'">
平一
</td>
<td ng-if="specialCardInfo[0].cyclesheet[8]=='p2'||specialCardInfo[0].cyclesheet[8]=='p4'">
平二
</td>
<td>{{specialCardInfo[0].cyclesheet[9]}}</td>
<td>{{specialCardInfo[0].cyclesheet[10]}}</td>
<td>{{specialCardInfo[0].cyclesheet[11] | limitTo:8}}</td>
<td>{{specialCardInfo[0].cyclesheet[12] | limitTo:8}}</td>
<td ng-if="specialCardInfo[0].cyclesheet[14]==0">无</td>
<td ng-if="specialCardInfo[0].cyclesheet[14]==1">
{{specialCardInfo[0].cyclesheet[13]}}
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<!--制证库-->
<div class="panel panel-default" ng-if="specialCardInfo[0].prod.length>0">
<div class="panel-heading">
<h3 class="panel-title">
制证库
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>组号</th>
<th>卸载数量</th>
<th>卸载日期</th>
<th>电写入数量</th>
<th>电写入日期</th>
<th>质检数量</th>
<th>质检日期</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].prod[0]}}</td>
<td>{{specialCardInfo[0].prod[1]}}</td>
<td>{{specialCardInfo[0].prod[2]}}</td>
<td>{{specialCardInfo[0].prod[3]}}</td>
<td>{{specialCardInfo[0].prod[4]}}</td>
<td>{{specialCardInfo[0].prod[5]}}</td>
<td>{{specialCardInfo[0].prod[6]}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<!--受理库-->
<div class="panel panel-default" ng-if="specialCardInfo[0].accu.length>0">
<div class="panel-heading">
<h3 class="panel-title">
受理库
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>组号</th>
<th>装库日期</th>
<th>组号状态</th>
<th>合格数</th>
<th>不合格数</th>
<th>核验日期</th>
<th>核验人</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].accu[0]}}</td>
<td>{{specialCardInfo[0].accu[1]}}</td>
<td>{{specialCardInfo[0].accu[2]}}</td>
<td>{{specialCardInfo[0].accu[3]}}</td>
<td>{{specialCardInfo[0].accu[4]}}</td>
<td>{{specialCardInfo[0].accu[5]}}</td>
<td>{{specialCardInfo[0].accu[6]}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<div ng-if="specialCardInfo[0].isGroup==11">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
循环单
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0 15px 0 15px;">
<table class="table">
<thead>
<th>循环单流水号</th>
<th>组号</th>
<th>证件数量</th>
<th>地市</th>
<th>制证类型</th>
<th>创建日期</th>
<th>最后修改日期</th>
<th>最后工序</th>
<th>机器号</th>
<th>制证车间</th>
<th>预定位接收时间</th>
<th>质检人</th>
<th>出库时间</th>
<th>入库时间</th>
<th>异常</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].cycleSheetID}}</td>
<td>{{specialCardInfo[0].groupNum}}</td>
<td>{{specialCardInfo[0].count}}</td>
<td>{{specialCardInfo[0].cityName}}</td>
<td>{{specialCardInfo[0].makeTypeName}}</td>
<td>{{specialCardInfo[0].createDate}}</td>
<td>{{specialCardInfo[0].lastDate}}</td>
<td>{{specialCardInfo[0].lastProcessName}}</td>
<td>{{specialCardInfo[0].machine}}</td>
<td ng-if="specialCardInfo[0].workShop=='p1'||specialCardInfo[0].workShop=='p3'">
平一
</td>
<td ng-if="specialCardInfo[0].workShop=='p2'||specialCardInfo[0].workShop=='p4'">
平二
</td>
<td>{{specialCardInfo[0].permanentPositionDate}}</td>
<td>{{specialCardInfo[0].qualityinspection}}</td>
<td>{{specialCardInfo[0].outbound}}</td>
<td>{{specialCardInfo[0].putInStorage}}</td>
<td ng-if="specialCardInfo[0].abnormal==0">无</td>
<td ng-if="specialCardInfo[0].abnormal==1">{{specialCardInfo[0].note}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/tpl/layout/searchSpecialCard/searchSpecialCard.js 0 → 100644
View file @ 9bf5fff5
app.controller('searchSpecialCardCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, ngDialog) {
if($rootScope.loginData.login === false){
$state.go("signin")
}else {
$state.go("layout.searchSpecialCard")
}
$scope.goBack = function(){
$state.go("layout.cycleSheet")
}
$scope.userState=$rootScope.loginData.state;
var getNowFormatDate = function () {
var date = new Date();
var month = date.getMonth() + 1;
var strDate = date.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = date.getFullYear() + "/" + month +"/"+ strDate;
return currentdate;
}
$scope.today = function() {
$scope.dt = getNowFormatDate();
};
$scope.today();
$scope.clear = function () {
$scope.dt = null;
};
$scope.disabled = function(date, mode) {
return ( mode === 'day' && ( date.getDay() === 0 || date.getDay() === 6 ) );
};
$scope.toggleMin = function() {
$scope.minDate = $scope.minDate ? null : new Date();
};
$scope.toggleMin();
$scope.open = function($event) {
$event.preventDefault();
$event.stopPropagation();
$scope.opened = true;
};
$scope.dateOptions = {
formatYear: 'yy',
startingDay: 1,
class: 'datepicker'
};
$scope.initDate = new Date('2016-15-20');
$scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
$scope.format = $scope.formats[1];
$scope.task_click = function(){
console.log($rootScope.loginData.state,"----测试-----",$scope.dt,"====");
}
$scope.createCycleSheet = function (groupState, acceptNo, type) {
$("#addBtn").attr("disabled", true);
var arr = [];
var json = {};
json.acceptNo = acceptNo;
json.type = type;
arr.push(json);
if (groupState == '新组' || groupState == '正在审核') {
MessageService.showAlert("未核验的组不能添加特证！");
$("#addBtn").removeAttr("disabled");
} else {
console.log(arr)
HttpService.saveSpecialCycle(arr, function (data) {
console.log(data)
console.log("------------")
if (data.respData.string == 1) {
MessageService.showAlert("加入特证成功。")
console.log($rootScope.searchInput)
HttpService.querySpecialCardInfo($rootScope.searchInput, function (data) {
if (data != null) {
$rootScope.specialCardInfo = data.respData;
console.log("搜索结果")
console.log(data.respData)
}
})
} else {
MessageService.showAlert("添加特证失败。");
}
})
}
}
$scope.returnCard = function (acceptNo) {
$("#returnBtn").attr("disabled", true);
HttpService.createSpecailCardPkg(cardid, function (data) {
MessageService.showAlert("退证成功。")
})
}
}]);
\ No newline at end of file
src/main/resources/static/tpl/layout/userList/userList.html
View file @ 9bf5fff5
<div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }"> <div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }">
<!-- hbox layout --> <!-- hbox layout -->
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light " ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;"> <div class="hbox hbox-auto-xs hbox-auto-sm bg-light "
ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<div style="padding: 20px;" class="layui-anim layui-anim-up"> <div style="padding: 20px;" class="layui-anim layui-anim-up">
<xblock> <xblock>
<button class="layui-btn" ng-click="addUser()"><i class="layui-icon"></i>添加</button> <button class="layui-btn" ng-click="addUser()"><i class="layui-icon"></i>添加</button>
</xblock> </xblock>
<table class="layui-table"> <table class="layui-table">
<thead> <thead>
<tr> <tr>
<th>ID</th> <th>ID</th>
<th>用户名</th> <th>用户名</th>
<th>别名</th> <th>别名</th>
<th>角色</th> <th>角色</th>
<th>状态</th> <th>状态</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="user in userList | orderBy:id track by user.id"> <tr ng-repeat="user in userList | orderBy:id track by user.id">
<td>{{user.id}}</td> <td>{{user.id}}</td>
<td>{{user.username}}</td> <td>{{user.username}}</td>
<td>{{user.name}}</td> <td>{{user.name}}</td>
<td> <td>
<span ng-repeat="role in user.roleList"> <span ng-repeat="role in user.roleList">
<span ng-repeat="permission in role.permissions"> <span ng-repeat="permission in role.permissions">
{{permission.name}}, {{permission.name}},
</span> </span>
</span> </span>
</td> </td>
<td class="td-status"> <td class="td-status">
<span ng-if="user.state==1" class="layui-btn layui-btn-normal layui-btn-mini layui-btn-disabled">已停用</span> <span ng-if="user.state==1"
<span ng-if="user.state==0" class="layui-btn layui-btn-normal layui-btn-mini">已启用</span> class="layui-btn layui-btn-normal layui-btn-mini layui-btn-disabled">已停用</span>
</td> <span ng-if="user.state==0" class="layui-btn layui-btn-normal layui-btn-mini">已启用</span>
<td> </td>
<a class="layui-btn layui-btn" ng-click="updateUser(user.id)">修改</a> <td>
<a class="layui-btn layui-btn-danger" ng-if="user.state==0&&user.username!='admin'" ng-click="delUser(user.id)">删除</a> <a class="layui-btn layui-btn" ng-click="updateUser(user.id)">修改</a>
<a class="layui-btn layui-btn-danger layui-btn-disabled" ng-if="user.username=='admin'">删除</a> <a class="layui-btn layui-btn-danger" ng-if="user.state==0&&user.username!='admin'"
<a class="layui-btn layui-btn-info" ng-if="user.state==1" ng-click="openUser(user.id)">启用</a> ng-click="delUser(user.id)">删除</a>
</td> <a class="layui-btn layui-btn-danger layui-btn-disabled" ng-if="user.username=='admin'">删除</a>
</tr> <a class="layui-btn layui-btn-info" ng-if="user.state==1" ng-click="openUser(user.id)">启用</a>
</tbody> </td>
</table> </tr>
</tbody>
</table>
</div> </div>
</div> </div>
<!-- /hbox layout --> <!-- /hbox layout -->
</div> </div>
\ No newline at end of file
src/main/resources/static/tpl/layout/userList/userList.js
View file @ 9bf5fff5
app.controller('userListCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage','ngDialog','HttpService', app.controller('userListCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'ngDialog', 'HttpService',
function($scope,$rootScope, $http,$state, $filter,$localStorage,ngDialog,HttpService) { function ($scope, $rootScope, $http, $state, $filter, $localStorage, ngDialog, HttpService) {
if($rootScope.loginData.login === false){ if ($rootScope.loginData.login === false) {
$state.go("signin") $state.go("signin")
}else { } else {
$state.go("layout.userList") $state.go("layout.userList")
} }
$scope.id = 'id'; $scope.id = 'id';
// 用户列表 // 用户列表
var getUserList = function(){ var getUserList = function () {
HttpService.getUserListData(function(data) { HttpService.getUserListData(function (data) {
$scope.userList = data; $scope.userList = data;
console.log($scope.userList); console.log($scope.userList);
}) })
} }
getUserList(); getUserList();
// 添加 // 添加
$scope.addUser = function(){ $scope.addUser = function () {
ngDialog.open({ ngDialog.open({
template: 'dialogs/addUser.html' + urlTimeStamp(), template: 'dialogs/addUser.html' + urlTimeStamp(),
width:800, width: 800,
cache: false, cache: false,
closeByDocument:false, closeByDocument: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) { controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getAllActiveRoleList(function(data) { HttpService.getAllActiveRoleList(function (data) {
$scope.activeRoleList = data; $scope.activeRoleList = data;
})
$scope.userAdd = function(roleId){
var user={};
user.username=$scope.username;
user.name=$scope.name;
user.password=$scope.password;
user.roleId=roleId;
HttpService.addUser(user,function(data){
$scope.closeThisDialog();
getUserList();
}) })
} $scope.userAdd = function (roleId) {
var user = {};
user.username = $scope.username;
user.name = $scope.name;
user.password = $scope.password;
user.roleId = roleId;
HttpService.addUser(user, function (data) {
$scope.closeThisDialog();
getUserList();
})
}
}] }]
}) })
} }
// 删除 // 删除
$scope.delUser = function(id){ $scope.delUser = function (id) {
HttpService.userDelete(id,function(data){ HttpService.userDelete(id, function (data) {
getUserList(); getUserList();
}) })
} }
// 启用 // 启用
$scope.openUser = function(id){ $scope.openUser = function (id) {
HttpService.userOpen(id,function(data){ HttpService.userOpen(id, function (data) {
getUserList(); getUserList();
}) })
} }
// 修改 // 修改
$scope.updateUser = function(id){ $scope.updateUser = function (id) {
ngDialog.open({ ngDialog.open({
template: 'dialogs/updateUser.html' + urlTimeStamp(), template: 'dialogs/updateUser.html' + urlTimeStamp(),
width:800, width: 800,
cache: false, cache: false,
closeByDocument:false, closeByDocument: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) { controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getUserById(id,function(data){ HttpService.getUserById(id, function (data) {
$scope.thisUser = data.user; $scope.thisUser = data.user;
console.log($scope.thisUser) console.log($scope.thisUser)
})
HttpService.getAllActiveRoleList(function(data) {
$scope.activeRoleList = data;
})
$scope.userUpdate = function(){
var jsonUser = {};
jsonUser.username=$scope.thisUser.username;
jsonUser.name=$scope.thisUser.name;
jsonUser.id =$scope.thisUser.id;
jsonUser.oldRoleId=$scope.thisUser.roleList[0].id;
jsonUser.roleId=$scope.thisUser.roleId;
console.log(jsonUser)
HttpService.updateUser(jsonUser,function(data){
$scope.closeThisDialog();
getUserList();
}) })
} HttpService.getAllActiveRoleList(function (data) {
}] $scope.activeRoleList = data;
})
$scope.userUpdate = function (roleId) {
var jsonUser = {};
jsonUser.username = $scope.thisUser.username;
jsonUser.name = $scope.thisUser.name;
jsonUser.id = $scope.thisUser.id;
jsonUser.oldRoleId = $scope.thisUser.roleList[0].id;
jsonUser.roleId = roleId;
console.log(jsonUser)
HttpService.updateUser(jsonUser, function (data) {
$scope.closeThisDialog();
getUserList();
})
}
}]
}) })
} }
}]) }])
\ No newline at end of file \ No newline at end of file
src/main/resources/static/tpl/layout/welcome/welcome.html
View file @ 9bf5fff5
<div class="app-content-body fade-in-up"> <div class="app-content-body fade-in-up">
<!-- main header --> <!-- main header -->
<div class="col"> <div class="col">
<div class="bg-light lter b-b wrapper-md"> <div class="bg-light lter b-b wrapper-md">
<div class="row"> <div class="row">
<div class="col-sm-12 col-xs-12"> <div class="col-sm-12 col-xs-12">
<h1 class="m-n font-thin h3 text-black">制证任务概览</h1> <h1 class="m-n font-thin h3 text-black">制证任务概览</h1>
...@@ -10,5 +10,5 @@ ...@@ -10,5 +10,5 @@
</div> </div>
</div> </div>
</div> </div>
<!-- / main header --> <!-- / main header -->
</div> </div>
\ No newline at end of file
src/main/resources/static/tpl/layout/welcome/welcome.js
View file @ 9bf5fff5
app.controller('welcomeCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage', function($scope,$rootScope, $http,$state, $filter,$localStorage) { app.controller('welcomeCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', function ($scope, $rootScope, $http, $state, $filter, $localStorage) {
if($rootScope.loginData.login == false){ if ($rootScope.loginData.login == false) {
$state.go("signin") $state.go("signin")
} }
}]) }])
\ No newline at end of file
src/main/resources/static/tpl/layout/yieldReport/yieldReport.html
View file @ 9bf5fff5
<div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }"> <div class="row" style="font-size: 1.3em;border-bottom:1px solid #CCCCCC;margin-bottom:10px;padding-top:10px;">
<!-- hbox layout --> <div class="col-md-2">
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light " ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;"> <div ng-if="loginData.state==1||state=='01'">地市质量报表</div>
<div ng-if="loginData.state==2||state=='02'">生产情况统计日报表</div>
<div ng-if="loginData.username=='ping1'||loginData.username=='ydw1'||state=='014'">平一日报表</div>
<div ng-if="loginData.username=='ping2'||loginData.username=='ydw2'||state=='024'">平二日报表</div>
<div ng-if="loginData.state==6||state=='06'">质检月报表</div>
<div ng-if="loginData.state==7||state=='07'||loginData.state==8">仓库报表</div>
</div>
<div class="col-md-10" style="text-align: right;">
<div style="width: auto" ng-if="loginData.state==0||loginData.state==2||state=='01'||state=='02'">
<span>起始日期：</span>
<input type="text" ng-model="nowDate" id="wdate1" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})">
<span>结束日期：</span>
<input type="text" ng-model="month_last" id="wdate2" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})">
<input type="submit" ng-if="loginData.state==1||state=='01'" class="btn btn-primary" value="查询" ng-click="myClickLlx()">
<input type="submit" ng-if="loginData.state==2||state=='02'" class="btn btn-primary" value="查询" ng-click="myClick()">
<span ng-if="msgAlert" style="color:red;font-size: 17px;">{{msgAlert}}</span>
</div>
<div style="width: auto" ng-if="loginData.state==4||state=='014'||state=='024'">
<span>查询日期：</span>
<input type="text" ng-model="nowDate" id="wdateCj" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})">
<input type="submit" class="btn btn-primary" value="查询" ng-click="myCjClick()">
</div>
<div style="width: auto" ng-if="loginData.state==6||state=='06'">
<span>预定位接收月份：</span>
<input type="text" ng-model="nowMonth" id="wdateZj" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyyMM',autoPickDate:'true'})">
<input type="submit" class="btn btn-primary" value="查询" ng-click="myZjClick()">
</div>
<div class="yx-div-header" ng-if="loginData.state==7||state=='07'||loginData.state==8">
<span>查询日期：</span>
<input type="text" id="wdate1" class="Wdate" ng-model="month_first" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})">
<span>-</span>
<input type="text" id="wdate2" class="Wdate" ng-model="month_last" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})">
<input type="submit" value="查询" class="btn btn-primary" ng-click="myClick()">
<span ng-if="msgAlert" style="color:red;font-size: 17px;">{{msgAlert}}</span>
</div>
</div>
</div>
<div id="mask-loading" class="mask-loading" ng-if="loading" style="background-color: rgba(0, 0, 0, 0.17);">
<div class="loading">
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
</div>
</div>
<div style="padding: 10px;background-color: #fff;border: 1px solid #CCC;border-radius: 10px;">
<div ng-if="loginData.state==1||state=='01'">
<div ng-if="dataCheckData.length>0 && dataCheckData[0][1]!='合计'">
<table class="table table-hover" style="margin-top:10px;">
<thead>
<th>地市</th>
<th>合格数</th>
<th>不合格数</th>
<th>不合格率</th>
</thead>
<tbody>
<tr ng-repeat="city in dataCheckData">
<td width="100px">{{city[1]}}</td>
<td width="100px">{{city[2]}}</td>
<td width="100px">{{city[3]}}</td>
<td width="100px" ng-if="city[4]==0">0</td>
<td width="100px" ng-if="city[4]>0">{{city[4] | number:2}} </td>
</tr>
</tbody>
</table>
<div style="text-align: right">
<button class="btn btn-primary" ng-click="printQualityReport()" >
下载报表
</button>
</div>
</div>
<div ng-if="dataCheckData.length==0 || dataCheckData[0][1]=='合计'" style="font-size:1.5em;">
当天暂无报表数据。
</div>
</div>
<div ng-if="loginData.state==2||state=='02'">
<div ng-if="printDataReport.dayInfo.length>0">
<table class="table table-hover" style="margin-top:10px;">
<thead>
<th></th>
<th>普通证</th>
<!--<th>特证</th>-->
<th>异地KS邮</th>
<th>异地KS普</th>
<th>异地邮</th>
<th>异地普</th>
<th>KS普</th>
<th>KS邮</th>
<th>邮寄证</th>
<th>废证</th>
<th>小计</th>
</thead>
<tbody>
<tr ng-repeat="city in printDataReport.dayInfo">
<td width="100px">{{city.cityName}}</td>
<td width="100px" ng-repeat="item in city.info track by $index" ng-if="$index!=1 && $index!=6 && $index!=10 && $index!=11 && $index!=12">
<span ng-if="item!=0">{{item}}</span>
<span ng-if="item==0"></span>
</td>
<td width="100px">{{city.info[12]}}</td>
<td width="100px">{{city.info[11]}}</td>
</tr>
</tbody>
</table>
<div style="text-align: right">
<button class="btn btn-primary" ng-click="printPrintDataReport()" >
下载报表
</button>
</div>
<div class="hbox hbox-auto-xs hbox-auto-sm"> </div>
<div class="col w-md bg-light dk b-r bg-auto"> <div ng-if="printDataReport.dayInfo == null" style="font-size:1.5em;">
<div class="wrapper b-b bg"> 当天暂无报表数据。
<button class="btn btn-sm btn-default pull-right visible-sm visible-xs" ui-toggle-class="show" target="#email-menu"><i class="fa fa-bars"></i></button> </div>
<a class="w-xs font-bold">{{msg}}</a> </div>
<div ng-if="loginData.state==4||state=='014'||state=='024'">
<div ng-if="pingReportByDay.normalInfo.length>0 &&pingReportByDay.normalInfo[0][11]!='合计'">
<table class="table table-hover" style="margin-top:10px;">
<thead>
<th>地市\制证类型</th>
<th>普通证</th>
<th>邮寄证</th>
<!--<th>特证</th>-->
<th>异地KS邮</th>
<th>异地KS普</th>
<th>异地邮</th>
<th>异地普</th>
<th>KS普</th>
<th>KS邮</th>
<th>小计</th>
</thead>
<tbody>
<tr ng-repeat="city in pingReportByDay.normalInfo">
<td width="100px">{{city[11]}}</td>
<td width="100px" ng-if="city[0]==0"></td>
<td width="100px" ng-if="city[0]!=0">{{city[0]}}</td>
<td width="100px" ng-if="city[9]==0"></td>
<td width="100px" ng-if="city[9]!=0">{{city[9]}}</td>
<td width="100px" ng-if="city[2]==0"></td>
<td width="100px" ng-if="city[2]!=0">{{city[2]}}</td>
<td width="100px" ng-if="city[3]==0"></td>
<td width="100px" ng-if="city[3]!=0">{{city[3]}}</td>
<td width="100px" ng-if="city[4]==0"></td>
<td width="100px" ng-if="city[4]!=0">{{city[4]}}</td>
<td width="100px" ng-if="city[5]==0"></td>
<td width="100px" ng-if="city[5]!=0">{{city[5]}}</td>
<td width="100px" ng-if="city[7]==0"></td>
<td width="100px" ng-if="city[7]!=0">{{city[7]}}</td>
<td width="100px" ng-if="city[8]==0"></td>
<td width="100px" ng-if="city[8]!=0">{{city[8]}}</td>
<td width="100px" ng-if="city[10]==0"></td>
<td width="100px" ng-if="city[10]!=0">{{city[10]}}</td>
</tr>
<tr>
<td colspan="11" style="text-align: left;" ng-if="pingReportByDay.failedinfo.substring(3,4)=='0'">
{{pingReportByDay.failedinfo.substring(0,5)}}
</td>
<td colspan="11" style="text-align: left;" ng-if="pingReportByDay.failedinfo.substring(3,4)!='0'">
{{pingReportByDay.failedinfo}}
</td>
</tr>
</tbody>
</table>
<div style="text-align: right;">
<button class="btn btn-primary" ng-click="printPingReportByDay()" >
下载报表
</button>
</div> </div>
</div>
<div ng-if="pingReportByDay.normalInfo.length==0 || pingReportByDay.normalInfo[0][11]=='合计'" style="font-size:1.5em;">
当天暂无报表数据。
</div> </div>
</div> </div>
<div ng-if="loginData.state==6||state=='06'">
<div ng-if="qulityCheckData.length>0 && qulityCheckData[0][3]!='合计'">
<table class="table table-hover" style="margin-top:10px;">
<thead>
<th>制证类型</th>
<th>制证一科</th>
<th>制证二科</th>
<th>小计</th>
</thead>
<tbody>
<tr ng-repeat="city in qulityCheckData">
<td width="100px">{{city[3]}}</td>
<td width="100px" ng-if="city[4]==0"></td>
<td width="100px" ng-if="city[4]!=0">{{city[4]}}</td>
</div> <td width="100px" ng-if="city[5]==0"></td>
<!-- /hbox layout --> <td width="100px" ng-if="city[5]!=0">{{city[5]}}</td>
<td width="100px" ng-if="city[0]==0">0</td>
<td width="100px" ng-if="city[0]!=0">{{city[0]}}</td>
</tr>
</tbody>
</table>
<div style="text-align: right">
<button class="btn btn-primary" ng-click="printQualityCheckReport()" >
下载报表
</button>
</div>
</div>
<div ng-if="qulityCheckData.length==0 || qulityCheckData[0][3]=='合计'" style="font-size:1.5em;">
当天暂无报表数据。
</div>
</div>
<div ng-if="loginData.state==7||state=='07'||loginData.state==8">
<div ng-if="StoreReportData.length==0" style="font-size:1.5em;">
当天暂无报表数据。
</div>
<div ng-if="StoreReportData.length>0">
<pre style="font-size: 1.3em;">{{totalCount}}</pre>
<div ng-repeat="city in StoreReportData">
<pre style="font-size: 1.3em;" ng-click="showTable($index)">{{city.cityName}}</pre>
<div ng-show="showtable==$index">
<table class="table table-hover" style="margin-top:10px;" border="1">
<thead>
<tr>
<th></th>
<th colspan="8" style="text-align: center;">普通类型</th>
<th colspan="8" style="text-align: center;">邮寄类型</th>
</tr>
<tr>
<th></th>
<th colspan="2" style="text-align: center;">普通证</th>
<th colspan="2" style="text-align: center;">异地KS普</th>
<th colspan="2" style="text-align: center;">异地普</th>
<th colspan="2" style="text-align: center;">KS普</th>
<th colspan="2" style="text-align: center;">邮寄证</th>
<th colspan="2" style="text-align: center;">异地KS邮</th>
<th colspan="2" style="text-align: center;">异地邮</th>
<th colspan="2" style="text-align: center;">KS邮</th>
</tr>
</thead>
<tbody>
<tr>
<td>区县</td>
<td>出库</td>
<td>入库</td>
<td>出库</td>
<td>入库</td>
<td>出库</td>
<td>入库</td>
<td>出库</td>
<td>入库</td>
<td>出库</td>
<td>入库</td>
<td>出库</td>
<td>入库</td>
<td>出库</td>
<td>入库</td>
<td>出库</td>
<td>入库</td>
</tr>
<tr ng-repeat="county in city.cityList">
<td width="100px">{{county.countyName}}</td>
<td width="100px">
<span ng-if="county.countyInfo[0]!=0">{{county.countyInfo[0]}}</span>
<span ng-if="county.countyInfo[0]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[1]!=0">{{county.countyInfo[1]}}</span>
<span ng-if="county.countyInfo[1]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[6]!=0">{{county.countyInfo[6]}}</span>
<span ng-if="county.countyInfo[6]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[7]!=0">{{county.countyInfo[7]}}</span>
<span ng-if="county.countyInfo[7]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[10]!=0">{{county.countyInfo[10]}}</span>
<span ng-if="county.countyInfo[10]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[11]!=0">{{county.countyInfo[11]}}</span>
<span ng-if="county.countyInfo[11]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[14]!=0">{{county.countyInfo[14]}}</span>
<span ng-if="county.countyInfo[14]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[15]!=0">{{county.countyInfo[15]}}</span>
<span ng-if="county.countyInfo[15]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[18]!=0">{{county.countyInfo[18]}}</span>
<span ng-if="county.countyInfo[18]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[19]!=0">{{county.countyInfo[19]}}</span>
<span ng-if="county.countyInfo[19]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[4]!=0">{{county.countyInfo[4]}}</span>
<span ng-if="county.countyInfo[4]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[5]!=0">{{county.countyInfo[5]}}</span>
<span ng-if="county.countyInfo[5]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[8]!=0">{{county.countyInfo[8]}}</span>
<span ng-if="county.countyInfo[8]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[9]!=0">{{county.countyInfo[9]}}</span>
<span ng-if="county.countyInfo[9]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[16]!=0">{{county.countyInfo[16]}}</span>
<span ng-if="county.countyInfo[16]==0"></span>
</td>
<td width="100px">
<span ng-if="county.countyInfo[17]!=0">{{county.countyInfo[17]}}</span>
<span ng-if="county.countyInfo[17]==0"></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div> </div>
\ No newline at end of file
src/main/resources/static/tpl/layout/yieldReport/yieldReport.js
View file @ 9bf5fff5
app.controller('yieldReportCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage', function($scope,$rootScope, $http,$state, $filter,$localStorage) { app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, ngDialog) {
if ($rootScope.loginData.login === false) {
if($rootScope.loginData.login == false){
$state.go("signin") $state.go("signin")
} else {
$state.go("layout.yieldReport")
}
$scope.userState = $rootScope.loginData.state;
// $scope.userState=5;
$scope.date = "date";
//获得当前年月日
var getNowFormatDetailDate = function () {
var date = new Date();
var month = date.getMonth() + 1;
var strDate = date.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = date.getFullYear() + "" + month + strDate;
return currentdate;
}
$scope.currentDetailDate = getNowFormatDetailDate();
$scope.nowDate = new Date("yyyyMMdd");
$scope.nowMonth = new Date("yyyyMM");
var getMonthFirstDay = function () {
var month_first = new Date("yyyyMMdd");
month_first.setDate(1);
return month_first;
}
var getMonthLastDay = function () {
var date = new Date();
var currentMonth = date.getMonth();
var nextMonth = ++currentMonth;
var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1);
var oneDay = 1000 * 60 * 60 * 24;
var month_last = new Date(nextMonthFirstDay - oneDay);
return $filter('date')(month_last,'yyyyMMdd');
}
$scope.month_first = getMonthFirstDay();
$scope.month_last = getMonthLastDay();
var getQualityReport = function (startDate, endDate) {
HttpService.getQualityReport(startDate, endDate, function (data) {
$scope.dataCheckData = data.respData;
console.log("初始化数据核验质量报表：", $scope.dataCheckData)
})
}
//初始化数据核验报表
if ($rootScope.loginData.state == 1 || $rootScope.loginData.state == 0) {
console.log($scope.currentDetailDate, $scope.month_last)
getQualityReport($scope.currentDetailDate, $scope.month_last)
}
$scope.myClickLlx = function () {
var startDate = $("#wdate1").val();
var endDate = $("#wdate2").val();
console.log("时间")
console.log(startDate, endDate)
getQualityReport(startDate, endDate);
}
// 打印数据核验质量报表按钮
$scope.printQualityReport = function () {
var startDate = $("#wdate1").val();
var endDate = $("#wdate2").val();
console.log("时间")
console.log(startDate, endDate)
HttpService.printQulityReportData(startDate, endDate, function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
document.body.appendChild(a);
a.href = URL.createObjectURL(blob);
a.click();
})
}
var getPrintDataReport = function (startDate, endDate) {
if ($rootScope.loginData.state == 2) {
HttpService.getPrintData(startDate, endDate, function (data) {
$scope.printDataReport = data.respData;
console.log("初始化打印卸载报表：", $scope.printDataReport)
})
}
if ($rootScope.loginData.state == 0) {
HttpService.getAdminPrintData(startDate, endDate, $scope.state.substring(1, 2), function (data) {
$scope.printDataReport = data.respData;
console.log("初始化打印卸载报表：", $scope.printDataReport)
})
}
}
if ($rootScope.loginData.state == 2 || $rootScope.loginData.state == 0) {
console.log($scope.currentDetailDate, $scope.month_last)
getPrintDataReport($scope.currentDetailDate, $scope.month_last)
}
// 打印 打印卸载报表按钮
$scope.printPrintDataReport = function () {
var startDate = $("#wdate1").val();
var endDate = $("#wdate2").val();
console.log("时间")
console.log(startDate, endDate)
if ($rootScope.loginData.state == 2) {
HttpService.printDataPrintUninstalreportData(startDate, endDate, function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
document.body.appendChild(a);
a.href = URL.createObjectURL(blob);
a.click();
})
}
if ($rootScope.loginData.state == 0) {
HttpService.printAdminDataPrintUninstalreportData(startDate, endDate, $scope.state.substring(1, 2), function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
document.body.appendChild(a);
a.href = URL.createObjectURL(blob);
a.click();
})
}
}
var getQualityCheckReport = function (month) {
if ($rootScope.loginData.state == 6) {
HttpService.getQualityCheckReportData(month, function (data) {
$scope.qulityCheckData = data.respData;
console.log("质检报表：", $scope.qulityCheckData)
})
}
if ($rootScope.loginData.state == 0) {
HttpService.getAdminQualityCheckReportData(month, $scope.state.substring(1, 2), function (data) {
$scope.qulityCheckData = data.respData;
console.log("质检报表：", $scope.qulityCheckData)
})
}
}
if ($rootScope.loginData.state == 6 || $rootScope.loginData.state == 0) {
getQualityCheckReport($scope.nowMonth)
}
$scope.printQualityCheckReport = function () {
var month = $("#wdateZj").val()
console.log("时间")
console.log(month)
if ($rootScope.loginData.state == 6) {
HttpService.printQualityCheckReportDatas(month, function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
document.body.appendChild(a);
a.href = URL.createObjectURL(blob);
a.click();
})
}
if ($rootScope.loginData.state == 0) {
HttpService.printAdminQualityCheckReportDatas(month, $scope.state.substring(1, 2), function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
document.body.appendChild(a);
a.href = URL.createObjectURL(blob);
a.click();
})
}
}
var getPingReportByDay = function (date) {
if ($rootScope.loginData.state == 4) {
HttpService.getPingReportByDayData(date, function (data) {
$scope.pingReportByDay = data.respData;
console.log("车间日报表：", $scope.pingReportByDay)
})
}
if ($rootScope.loginData.state == 0) {
HttpService.getAdminPingReportByDayData(date, 'p' + $scope.state.substring(1, 2), function (data) {
$scope.pingReportByDay = data.respData;
console.log("车间日报表：", $scope.pingReportByDay)
})
}
}
if ($rootScope.loginData.state == 4 || $rootScope.loginData.state == 0) {
getPingReportByDay($scope.nowDate);
}
$scope.printPingReportByDay = function () {
var date = $("#wdateCj").val()
console.log("时间")
console.log(date)
if ($rootScope.loginData.state == 4) {
HttpService.printPingReportByDay(date, function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
document.body.appendChild(a);
a.href = URL.createObjectURL(blob);
a.click();
})
}
if ($rootScope.loginData.state == 0) {
HttpService.printAdminPingReportByDay(date, 'p' + $scope.state.substring(1, 2), function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
document.body.appendChild(a);
a.href = URL.createObjectURL(blob);
a.click();
})
}
}
// var getCkReportByDay = function(date){
// HttpService.getYieldDailyReportByStorehouseData(date,function(data){
// $scope.storeRportData = data.respData;
// console.log("仓库产量日报表：",$scope.storeRportData)
// })
// }
// if($rootScope.loginData.state == 7){
// getCkReportByDay($scope.nowDate);
// }
// var getStorehouseReportDatas = function(start,end){
// HttpService.getCkReportData(start,end,function(data){
// $scope.StoreReportData= data.respData;
// for(var i=0;i<$scope.StoreReportData.length;i++){
// if(i==0){
// $scope.StoreReportData[i].isActive=true;
// }else{
// $scope.StoreReportData[i].isActive=false;
// }
// }
// console.log("初始化仓库报表：",data.respData)
// })
// }
// if($rootScope.loginData.state == 7||$rootScope.loginData.state == 0) {
// getStorehouseReportDatas($scope.month_first,$scope.month_last)
// }
$scope.showtable = -1;
$scope.showTable = function (index) {
if ($scope.showtable != index) {
$scope.showtable = index;
}
else {
$scope.showtable = -1;
}
}
var getStorehouseReportDatas = function (start, end) {
HttpService.getStorehouseReportDatas(start, end, function (data) {
$scope.totalCount = data.respData.sumInfo;
$scope.StoreReportData = data.respData.listInfo;
for (var i = 0; i < $scope.StoreReportData.length; i++) {
if (i == 0) {
$scope.StoreReportData[i].isActive = true;
} else {
$scope.StoreReportData[i].isActive = false;
}
}
console.log("初始化仓库出入库报表：", data.respData)
})
}
if ($rootScope.loginData.state == 7 || $rootScope.loginData.state == 0 || $rootScope.loginData.state == 8) {
getStorehouseReportDatas($scope.month_first, $scope.month_last)
}
$scope.printStoreDayReport = function () {
var date = $("#wdateCj").val()
console.log("时间")
console.log(date)
HttpService.printStoreReportByDay(date, function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
document.body.appendChild(a);
a.href = URL.createObjectURL(blob);
a.click();
})
}
$scope.myClick = function () {
var start = $("#wdate1").val()
var end = $("#wdate2").val()
if (parseInt(start) <= parseInt(end)) {
$scope.msgAlert = '';
if ($rootScope.loginData.state == 2 || $scope.state == '02') {
getPrintDataReport(start, end);
}
if ($rootScope.loginData.state == 7 || $scope.state == '07' || $rootScope.loginData.state == 8) {
getStorehouseReportDatas(start, end)
}
} else {
$scope.msgAlert = "起始日期不能大于结束日期，请重新选择！";
}
}
$scope.myZjClick = function () {
var month = $("#wdateZj").val()
getQualityCheckReport(month)
}
$scope.myCjClick = function () {
var date = $("#wdateCj").val()
if ($rootScope.loginData.state == 4 || $rootScope.loginData.state == 0) {
getPingReportByDay(date);
}
} }
$scope.msg = "报表页面" }]);
}]) \ No newline at end of file
\ No newline at end of file
制证项目E-R图.pdm 0 → 100644
View file @ 9bf5fff5
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment