Skip to content

Y
YX_IDENT_REFACTORING
Commit 4f823c47 authored by xuwang's avatar xuwang
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents d1792a98 fb6c9775
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 914 additions and 224 deletions
pom.xml
View file @ 4f823c47
...@@ -28,6 +28,12 @@ ...@@ -28,6 +28,12 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
...@@ -50,9 +56,35 @@ ...@@ -50,9 +56,35 @@
<!--引入log4j2作为日志组件--> <!--引入log4j2作为日志组件-->
<!--<dependency>--> <!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>--> <!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-starter-log4j2</artifactId>--> <!--<artifactId>spring-boot-starter-log4j</artifactId>-->
<!--<version>1.3.2.RELEASE</version>-->
<!--</dependency>--> <!--</dependency>-->
<!--<dependency>-->
<!--<groupId>log4j</groupId>-->
<!--<artifactId>log4j</artifactId>-->
<!--<version>1.2.17</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.12</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<!-- shiro相关 --> <!-- shiro相关 -->
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
...@@ -77,6 +109,22 @@ ...@@ -77,6 +109,22 @@
<version>1.6.1</version> <version>1.6.1</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j</artifactId>
<version>1.3.8.RELEASE</version>
</dependency>
<dependency> <dependency>
<groupId>net.sf.json-lib</groupId> <groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId> <artifactId>json-lib</artifactId>
......
src/log4j.properties
View file @ 4f823c47
log4j.rootCategory=DEBUG,stdout,DebugAppender,InfoAppender,ErrorAppender #控制日志级别，在哪里输出Output pattern : date [thread] priority category - message FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7
log4j.debug=true log4j.rootLogger=INFO, stdout
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.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.InfoAppender=org.apache.log4j.DailyRollingFileAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.InfoAppender.File=../logs/b.log #日志输出的格式
log4j.appender.InfoAppender.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%c{5}] - %m%n
log4j.appender.InfoAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#error log input file #打印sql部分
log4j.logger.ErrorAppender.access=ERROR log4j.logger.java.sql=DEBUG
log4j.appender.ErrorAppender=org.apache.log4j.DailyRollingFileAppender log4j.logger.java.sql.Connection = DEBUG
log4j.appender.ErrorAppender.File=../logs/c.log log4j.logger.java.sql.Statement = DEBUG
log4j.appender.ErrorAppender.Append = true log4j.logger.java.sql.PreparedStatement = DEBUG
log4j.appender.ErrorAppender.threshold = ERROR log4j.logger.java.sql.ResultSet = DEBUG
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 log4j.logger.com.yxproject.start.entity=DEBUG
\ No newline at end of file
src/main/java/com/yxproject/start/api/UserApi.java
View file @ 4f823c47
...@@ -60,6 +60,10 @@ public class UserApi { ...@@ -60,6 +60,10 @@ public class UserApi {
private TypeListService typeListService; private TypeListService typeListService;
@Autowired @Autowired
private ReceiptListService receiptListService; private ReceiptListService receiptListService;
@Autowired
private FailedTypeService failedTypeService;
@Autowired
private ProdCardService prodCardService;
// @Autowired // @Autowired
// private ReadCountyListXMLService readCountyListXMLService; // private ReadCountyListXMLService readCountyListXMLService;
...@@ -129,16 +133,19 @@ public class UserApi { ...@@ -129,16 +133,19 @@ public class UserApi {
* *
* @return * @return
*/ */
@RequestMapping(value = "/updateProductionTask", method = RequestMethod.GET) @RequestMapping(value = "/updateTaskState", method = RequestMethod.GET)
@RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
@ResponseBody @ResponseBody
public String updateProductionTask(@RequestParam("id") String id, HttpServletResponse resp) { public String updateProductionTask(@RequestParam("taskId") Long id,@RequestParam("state") int state, 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);
TaskEntity taskEntity = new TaskEntity();
taskEntity.setTask_Id(id);
taskEntity.setTask_State_Id(state);
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(taskEntity);
yxjsonResponse.outPutSuccess(i + "更新成功"); yxjsonResponse.outPutSuccess(i + "更新成功");
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
...@@ -351,8 +358,8 @@ public class UserApi { ...@@ -351,8 +358,8 @@ public class UserApi {
*/ */
@RequestMapping("getCountyList") @RequestMapping("getCountyList")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String getCountyListInfoByTaskId(@RequestParam("taskId") String taskId,@RequestParam("taskStateId") String taskStateId,@RequestParam("cardType") String cardType, HttpServletResponse resp) { public String getCountyListInfoByTaskId(@RequestParam("taskId") String taskId, HttpServletResponse resp) {
List<CountyEntity> countyListEntity = countyService.findCountyList(taskId,taskStateId,cardType); List<CountyEntity> countyListEntity = countyService.findCountyList(taskId);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(countyListEntity); yxjsonResponse.outPutSuccess(countyListEntity);
...@@ -366,7 +373,7 @@ public class UserApi { ...@@ -366,7 +373,7 @@ public class UserApi {
* *
* @return * @return
*/ */
@RequestMapping("getGroupListByTaskListId") @RequestMapping("getGroupListByTaskId")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String getGroupListByTaskId(@RequestParam("taskId") String taskId, HttpServletResponse resp) { public String getGroupListByTaskId(@RequestParam("taskId") String taskId, HttpServletResponse resp) {
List<GroupListEntity> groupNoEntity = groupListService.findGroupListByTaskId(taskId); List<GroupListEntity> groupNoEntity = groupListService.findGroupListByTaskId(taskId);
...@@ -498,6 +505,38 @@ public class UserApi { ...@@ -498,6 +505,38 @@ public class UserApi {
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/**
* 查询简易证件信息;
*
* @return
*/
@RequestMapping("selectProdCard")
// @RequiresPermissions("userInfo.add")//权限管理;
public String selectProdCard(@RequestParam("idNo") List idNo, HttpServletResponse resp) {
List<ProdCardEntity> taskEntity = prodCardService.getProdCard(idNo);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(taskEntity);
Map map = new HashMap();
return yxjsonResponse.toJSONString();
}
/**
* 查询查询废证类型List;
*
* @return
*/
@RequestMapping("getFailedType")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getFailedType(HttpServletResponse resp) {
List<FailedTypeEntity> failedTypeEntity = failedTypeService.getFailedType();
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(failedTypeEntity);
Map map = new HashMap();
return yxjsonResponse.toJSONString();
}
/** /**
* 更新循环单 * 更新循环单
* 添加异常状态; * 添加异常状态;
...@@ -505,13 +544,10 @@ public class UserApi { ...@@ -505,13 +544,10 @@ public class UserApi {
*/ */
@RequestMapping("addExceptionState") @RequestMapping("addExceptionState")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String addExceptionState(@RequestParam("exception_Information") String exception_Information, HttpServletResponse resp) { public String addExceptionState(@RequestParam("taskId") String taskId,@RequestParam("exceptionInformation") String exceptionInformation, HttpServletResponse resp) {
String map = "{\"task_Id\":\"20181016001\",\"exception_Information\":0} "; int i = taskService.addExceptionState(taskId,exceptionInformation);
JSONObject jsonObject = JSONObject.fromObject(map);
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);
yxjsonResponse.outPutSuccess(i + "更新成功"); yxjsonResponse.outPutSuccess(i + "更新成功");
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
......
src/main/java/com/yxproject/start/entity/CityListEntity.java
View file @ 4f823c47
...@@ -32,7 +32,7 @@ public class CityListEntity { ...@@ -32,7 +32,7 @@ public class CityListEntity {
private long printerId; private long printerId;
private String cityName; private String cityName;
private long groupCount; private long groupCount;
private long groupNo; private String groupNo;
private long validCount; private long validCount;
private long invalidCount; private long invalidCount;
...@@ -244,11 +244,11 @@ public class CityListEntity { ...@@ -244,11 +244,11 @@ public class CityListEntity {
@Basic @Basic
@Column(name = "groupNo", nullable = true, precision = 0) @Column(name = "groupNo", nullable = true, precision = 0)
public long getGroupNo() { public String getGroupNo() {
return groupNo; return groupNo;
} }
public void setGroupNo(long groupNo) { public void setGroupNo(String groupNo) {
this.groupNo = groupNo; this.groupNo = groupNo;
} }
......
src/main/java/com/yxproject/start/entity/FailedTypeEntity.java 0 → 100644
View file @ 4f823c47
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Objects;
/**
* Created by Administrator on 2018/12/26.
*/
@Entity
@Table(name = "FAILED_TYPE", schema = "DAHAI")
public class FailedTypeEntity {
private long failedCardReasonId;
private String failedCardReason;
@Id
@Column(name = "failedCardReasonId", nullable = false, precision = 0)
public long getFailedCardReasonId() {
return failedCardReasonId;
}
public void setFailedCardReasonId(long failedCardReasonId) {
this.failedCardReasonId = failedCardReasonId;
}
@Basic
@Column(name = "failedCardReason", nullable = true, length = 20)
public String getFailedCardReason() {
return failedCardReason;
}
public void setFailedCardReason(String failedCardReason) {
this.failedCardReason = failedCardReason;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
FailedTypeEntity that = (FailedTypeEntity) o;
return Objects.equals(failedCardReasonId, that.failedCardReasonId) &&
Objects.equals(failedCardReason, that.failedCardReason);
}
@Override
public int hashCode() {
return Objects.hash(failedCardReasonId, failedCardReason);
}
}
src/main/java/com/yxproject/start/entity/ProdCardEntity.java 0 → 100644
View file @ 4f823c47
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Objects;
/**
* Created by Administrator on 2018/12/26.
*/
@Entity
@Table(name = "PROD_CARD", schema = "DAHAI")
public class ProdCardEntity {
private String idNo;
private String name;
private String acceptNo;
private long specialType;
@Id
@Column(name = "idNo", nullable = false, precision = 0)
public String getIdNo() {
return idNo;
}
public void setIdNo(String idNo) {
this.idNo = idNo;
}
@Basic
@Column(name = "name", nullable = false, precision = 0)
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Basic
@Column(name = "acceptNo", nullable = false, precision = 0)
public String getAcceptNo() {
return acceptNo;
}
public void setAcceptNo(String acceptNo) {
this.acceptNo = acceptNo;
}
@Basic
@Column(name = "specialType", nullable = false, precision = 0)
public long getSpecialType() {
return specialType;
}
public void setSpecialType(long specialType) {
this.specialType = specialType;
}
@Override
public boolean equals(Object o) {
if(this == o) return true;
if(o == null || getClass() != o.getClass()) return false;
ProdCardEntity that=(ProdCardEntity) o;
return Objects.equals(idNo, that.idNo) &&
Objects.equals(name, that.name) &&
Objects.equals(acceptNo, that.acceptNo) &&
Objects.equals(specialType, that.specialType);
}
@Override
public int hashCode() {
return Objects.hash(idNo, name, acceptNo, specialType);
}
}
src/main/java/com/yxproject/start/mapper/CountyListMapper.java
View file @ 4f823c47
...@@ -16,7 +16,7 @@ import java.util.Map; ...@@ -16,7 +16,7 @@ import java.util.Map;
@Mapper @Mapper
public interface CountyListMapper { public interface CountyListMapper {
public List<CountyEntity> findCountyList(@Param("taskId") String taskId,@Param("taskStateId") String taskStateId,@Param("cardType") String cardType); public List<CountyEntity> findCountyList(String taskId);
public int reviseStorageCount( @Param("taskId") String taskId, @Param("countyCode") String countyCode,@Param("inStorageCount") String inStorageCount,@Param("outStorageCount") String out_Storage_Count); public int reviseStorageCount( @Param("taskId") String taskId, @Param("countyCode") String countyCode,@Param("inStorageCount") String inStorageCount,@Param("outStorageCount") String out_Storage_Count);
public List<ReceiptListEntity> getReceiptList( @Param("startDate")String startDate , @Param("endDate") String endDate); public List<ReceiptListEntity> getReceiptList( @Param("startDate")String startDate , @Param("endDate") String endDate);
public List<CountyListEntity> findStorageCountByTaskId(String taskId); public List<CountyListEntity> findStorageCountByTaskId(String taskId);
......
src/main/java/com/yxproject/start/mapper/SpecialCardMapper.java
View file @ 4f823c47
package com.yxproject.start.mapper; package com.yxproject.start.mapper;
import com.yxproject.start.entity.FailedTypeEntity;
import com.yxproject.start.entity.ProdCardEntity;
import com.yxproject.start.entity.SpecialCardEntity; import com.yxproject.start.entity.SpecialCardEntity;
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;
/** /**
* Created by zhangyusheng on 2018/11/7 15:06 * Created by zhangyusheng on 2018/11/7 15:06
...@@ -17,4 +21,6 @@ public interface SpecialCardMapper { ...@@ -17,4 +21,6 @@ public interface SpecialCardMapper {
public List <SpecialCardEntity> findSpecialCardList( String groupNo); public List <SpecialCardEntity> findSpecialCardList( String groupNo);
public List <SpecialCardEntity> addTuiZheng(String acceptNumber); public List <SpecialCardEntity> addTuiZheng(String acceptNumber);
public List<SpecialCardEntity> addRemainingCard(String accept_Number); public List<SpecialCardEntity> addRemainingCard(String accept_Number);
public List<ProdCardEntity> getProdCard ( String idNo);
public List<FailedTypeEntity> getFailedType();
} }
src/main/java/com/yxproject/start/mapper/TaskMapper.java
View file @ 4f823c47
...@@ -17,7 +17,8 @@ public interface TaskMapper { ...@@ -17,7 +17,8 @@ public interface TaskMapper {
public int updateTaskEntity(TaskEntity taskEntity); public int updateTaskEntity(TaskEntity taskEntity);
public List<TaskEntity> findTaskEntityByAcceptNo(String acceptNo); public List<TaskEntity> findTaskEntityByAcceptNo(String acceptNo);
public List<TaskEntity> findTaskEntityByState(int state); public List<TaskEntity> findTaskEntityByState(int state);
public int replaceExceptionInformation(TaskEntity taskEntity); public int updateTaskIsException(@Param("taskId") String taskId,@Param("exceptionInformation") String exceptionInformation,@Param("isException")String isException);
public int replaceExceptionInformation(@Param("taskId")String taskId,@Param("isException")String isException);
public List<TypeListEntity> findTypeListByTaskStateId(String taskStateId); public List<TypeListEntity> findTypeListByTaskStateId(String taskStateId);
public List <CityListEntity> findCityList(@Param("taskStateId") String taskStateId,@Param("cardType") String cardType); public List <CityListEntity> findCityList(@Param("taskStateId") String taskStateId,@Param("cardType") String cardType);
public int updateOutStorageDate(String taskId); public int updateOutStorageDate(String taskId);
......
src/main/java/com/yxproject/start/service/CountyService.java
View file @ 4f823c47
...@@ -8,7 +8,7 @@ import java.util.List; ...@@ -8,7 +8,7 @@ import java.util.List;
* Created by Administrator on 2018/12/19. * Created by Administrator on 2018/12/19.
*/ */
public interface CountyService { public interface CountyService {
public List<CountyEntity> findCountyList( String taskId,String taskStateId,String cardType); public List<CountyEntity> findCountyList( String taskId);
} }
src/main/java/com/yxproject/start/service/FailedTypeService.java 0 → 100644
View file @ 4f823c47
package com.yxproject.start.service;
import com.yxproject.start.entity.FailedTypeEntity;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/26.
*/
public interface FailedTypeService {
public List<FailedTypeEntity> getFailedType();
}
src/main/java/com/yxproject/start/service/ProdCardService.java 0 → 100644
View file @ 4f823c47
package com.yxproject.start.service;
import com.yxproject.start.entity.ProdCardEntity;
import java.util.List;
import java.util.Map;
/**
* Created by Administrator on 2018/12/26.
*/
public interface ProdCardService {
public List<ProdCardEntity> getProdCard ( List idNo);
}
src/main/java/com/yxproject/start/service/TaskService.java
View file @ 4f823c47
...@@ -26,7 +26,8 @@ public interface TaskService { ...@@ -26,7 +26,8 @@ public interface TaskService {
public List<Map<String,Object>> findProductionTaskListEntityByState(int state); public List<Map<String,Object>> findProductionTaskListEntityByState(int state);
public int addExceptionState(TaskEntity state); public int addExceptionState(String taskId, String exceptionInformation);
// public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount); // public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount);
......
src/main/java/com/yxproject/start/service/impl/CityListServiceImpl.java
View file @ 4f823c47
package com.yxproject.start.service.impl; package com.yxproject.start.service.impl;
import com.yxproject.start.entity.CityListEntity; import com.yxproject.start.entity.CityListEntity;
import com.yxproject.start.entity.GroupListEntity;
import com.yxproject.start.mapper.GroupNoMapper;
import com.yxproject.start.mapper.TaskMapper; import com.yxproject.start.mapper.TaskMapper;
import com.yxproject.start.service.CityListService; import com.yxproject.start.service.CityListService;
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.*;
import java.util.List;
import java.util.Map;
/** /**
* Created by Administrator on 2018/12/19. * Created by Administrator on 2018/12/19.
...@@ -18,11 +18,66 @@ public class CityListServiceImpl implements CityListService { ...@@ -18,11 +18,66 @@ public class CityListServiceImpl implements CityListService {
@Autowired @Autowired
public TaskMapper taskMapper; public TaskMapper taskMapper;
@Autowired
public GroupNoMapper groupNoMapper;
private String createGroupNo(List<Integer> c, List<Integer> nsList) {
try {
String groupNo = "";
c.add(nsList.get(0));
Collections.sort(nsList);
for (int i = 0; i < nsList.size() - 1; ++i) {
if (nsList.get(i) + 1 == nsList.get(i + 1)) {
c.add(nsList.get(i));
} else {
Collections.sort(c);
if (c.size() >= 1) {
if (c.size() == 1) {
groupNo += c.get(0) + ",";
} else {
groupNo += c.get(0) + "-" + c.get(c.size() - 1) + ",";
}
}
c.clear();
c.add(nsList.get(i + 1));
}
}
Collections.sort(c);
if (c.size() >= 1) {
if (c.size() == 1) {
groupNo += c.get(0) + ",";
} else {
groupNo += c.get(0) + "-" + c.get(c.size() - 1) + ",";
}
}
return groupNo;
} catch (Exception e) {
}
return "";
}
@Override @Override
public List <CityListEntity> findCityList( String taskStateId ,String cardType) { public List <CityListEntity> findCityList( String taskStateId ,String cardType) {
List <CityListEntity> cityList =taskMapper.findCityList(taskStateId, cardType); List<CityListEntity> list1 = taskMapper.findCityList(taskStateId,cardType);
return cityList; List<CityListEntity> list2 = new ArrayList<CityListEntity>();
for (CityListEntity cityListEntity : list1) {
List <GroupListEntity> groupListEntities=groupNoMapper.findGroupListByTaskId(cityListEntity.getTaskId() + "");
if(groupListEntities.size() == 1 ){
cityListEntity.setGroupNo(String.valueOf(groupListEntities.get(0).getGroupNo()));
} else if(groupListEntities.size() > 1 ){
List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>();
for (int i = 0; i < groupListEntities.size(); i++){
nsList.add(Integer.parseInt( groupListEntities.get(i).getGroupNo()+"" ));
}
cityListEntity.setGroupCount(nsList.size());
cityListEntity.setGroupNo(createGroupNo(c, nsList));
}else {
cityListEntity.setGroupNo("");
}
list2.add(cityListEntity);
}
return list2;
} }
} }
src/main/java/com/yxproject/start/service/impl/CountyServiceImpl.java
View file @ 4f823c47
...@@ -20,8 +20,8 @@ public class CountyServiceImpl implements CountyService { ...@@ -20,8 +20,8 @@ public class CountyServiceImpl implements CountyService {
public CountyListMapper countyListMapper; public CountyListMapper countyListMapper;
@Override @Override
public List <CountyEntity> findCountyList( String taskId, String taskStateId, String cardType ) { public List <CountyEntity> findCountyList( String taskId ) {
List<CountyEntity> county = countyListMapper.findCountyList(taskId,taskStateId,cardType); List<CountyEntity> county = countyListMapper.findCountyList(taskId);
return county; return county;
} }
......
src/main/java/com/yxproject/start/service/impl/FailedTypeServiceImpl.java 0 → 100644
View file @ 4f823c47
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.FailedTypeEntity;
import com.yxproject.start.mapper.SpecialCardMapper;
import com.yxproject.start.service.*;
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/26.
*/
@Service
public class FailedTypeServiceImpl implements FailedTypeService {
@Autowired
private SpecialCardMapper specialCardMapper;
/**
* 查询废证类型
* @return
*/
@Override
public List<FailedTypeEntity> getFailedType (){
List<FailedTypeEntity> getFailedType = specialCardMapper.getFailedType();
return getFailedType;
}
}
src/main/java/com/yxproject/start/service/impl/ProdCardServiceImpl.java 0 → 100644
View file @ 4f823c47
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.ProdCardEntity;
import com.yxproject.start.mapper.SpecialCardMapper;
import com.yxproject.start.service.ProdCardService;
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/26.
*/
@Service
public class ProdCardServiceImpl implements ProdCardService {
@Autowired
public SpecialCardMapper specialCardMapper;
/**
* 查询简易证件信息
* @return
*/
@Override
public List<ProdCardEntity> getProdCard ( List idNo){
List list = new ArrayList<>();
for (int i=0; i <idNo.size() ; i++) {
list.add(specialCardMapper.getProdCard((String) idNo.get(i)));
}
// 去重
for ( int i = 0 ; i < list.size() - 1 ; i ++ ) {
for ( int j = list.size() - 1 ; j > i; j -- ) {
if (list.get(j).equals(list.get(i))) {
list.remove(j);
}
}
}
return list;
}
}
src/main/java/com/yxproject/start/service/impl/TaskServiceImpl.java
View file @ 4f823c47
...@@ -420,38 +420,20 @@ public class TaskServiceImpl implements TaskService { ...@@ -420,38 +420,20 @@ public class TaskServiceImpl implements TaskService {
* @return * @return
*/ */
@Override @Override
public int addExceptionState(TaskEntity taskEntity) { public int addExceptionState(String taskId, String exceptionInformation) {
int i =0; int i =0;
if(taskEntity.getException_Information()!=null) { String isException;
taskEntity.setIs_Exception((long)1); if(Integer.parseInt(exceptionInformation) != 0) {
i=taskMapper.updateTaskEntity(taskEntity); isException =String.valueOf(1);
i=taskMapper.updateTaskIsException(taskId,exceptionInformation,isException);
} else { } else {
taskEntity.setIs_Exception((long)0); isException =String.valueOf(0);
i=taskMapper.replaceExceptionInformation(taskEntity); i=taskMapper.replaceExceptionInformation(taskId,isException);
} }
return i; return i;
} }
// /**
// * 更新出入库时间
// * @param
// * @return
// */
// @Override
// public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount ) {
// int j=0;
// j= taskMapper.totalNum(j);
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
// if (inStorageCount.equals(j)){
// taskMapper.updateInStorageDate(taskListId,inStorageCount,outStorageCount);
// }
// if(outStorageCount.equals(j)){
// taskMapper.updateOutStorageDate(taskListId,inStorageCount,outStorageCount);
// }
// return 0;
// }
/** /**
* 测试查询 * 测试查询
......
src/main/resources/application.yml
View file @ 4f823c47
...@@ -7,6 +7,11 @@ mybatis: ...@@ -7,6 +7,11 @@ mybatis:
#加载Mybatis配置文件 #加载Mybatis配置文件
mapper-locations: classpath:mapper/*Mapper.xml mapper-locations: classpath:mapper/*Mapper.xml
config-location: classpath:mapper/config/mybatis-config.xml config-location: classpath:mapper/config/mybatis-config.xml
#logging.level.*=DEBUG
#logging:
# level:
# com.yx_project.start.mapper.*: debug
# logging.level.com.hz.controller=WARN #控制器层
#配置调度生产Oracle数据库 #配置调度生产Oracle数据库
spring: spring:
...@@ -16,6 +21,7 @@ spring: ...@@ -16,6 +21,7 @@ spring:
username: dahai username: dahai
password: dahai password: dahai
#配置shiro #配置shiro
shiro: shiro:
loginUrl: http://localhost:8081 loginUrl: http://localhost:8081
......
src/main/resources/log4j.properties
View file @ 4f823c47
log4j.rootCategory=DEBUG,stdout,DebugAppender,InfoAppender,ErrorAppender log4j.rootCategory=DEBUG,stdout,DebugAppender,InfoAppender,ErrorAppender
log4j.debug=true log4j.debug=true log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=[QC] %p [%t] %C.%M(%L) | %m%n
log4j.appender.stdout.layout.ConversionPattern=[QC] %p [%t] %C.%M(%L) | %m%n #logger input file log4j.logger.DebugAppender.access=DEBUG
#logger input file log4j.appender.DebugAppender=org.apache.log4j.DailyRollingFileAppender
log4j.logger.DebugAppender.access=DEBUG log4j.appender.DebugAppender.File=../logs/a.log
log4j.appender.DebugAppender=org.apache.log4j.DailyRollingFileAppender log4j.appender.DebugAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.DebugAppender.File=../logs/a.log log4j.appender.DebugAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
log4j.appender.DebugAppender.layout=org.apache.log4j.PatternLayout #logger input file log4j.logger.InfoAppender.access=INFO
log4j.appender.DebugAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n log4j.appender.InfoAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.InfoAppender.File=../logs/b.log
#logger input file log4j.appender.InfoAppender.layout=org.apache.log4j.PatternLayout
log4j.logger.InfoAppender.access=INFO log4j.appender.InfoAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
log4j.appender.InfoAppender=org.apache.log4j.DailyRollingFileAppender #error log input file log4j.logger.ErrorAppender.access=ERROR
log4j.appender.InfoAppender.File=../logs/b.log log4j.appender.ErrorAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.InfoAppender.layout=org.apache.log4j.PatternLayout log4j.appender.ErrorAppender.File=../logs/c.log
log4j.appender.InfoAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n log4j.appender.ErrorAppender.Append = true
log4j.appender.ErrorAppender.threshold = ERROR
#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=org.apache.log4j.PatternLayout
log4j.appender.ErrorAppender.layout.ConversionPattern=%d{MM-dd HH:mm:ss.SSS} %c %-5p - %m%n 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/CountyListMapper.xml
View file @ 4f823c47
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
<!--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="findCountyList" resultType="com.yxproject.start.entity.CountyEntity" parameterType="String"> <select id="findCountyList" resultType="com.yxproject.start.entity.CountyEntity" parameterType="String">
SELECT COUNTY_LIST.COUNTY_CODE,FINISH_COUNT,IN_STORAGE_COUNT,OUT_STORAGE_COUNT,COUNTY_DIC.COUNTYNAME FROM COUNTY_LIST SELECT COUNTY_LIST.COUNTY_CODE,(IN_STORAGE_COUNT + OUT_STORAGE_COUNT) AS 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 TASK ON COUNTY_LIST.TASK_ID = TASK.TASK_ID
LEFT JOIN COUNTY_DIC ON COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE LEFT JOIN COUNTY_DIC ON COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE
WHERE TASK.TASK_ID=#{taskId} AND TASK.CARD_TYPE=#{cardType} AND TASK.TASK_STATE_ID=#{taskStateId} WHERE TASK.TASK_ID=#{taskId}
</select> </select>
<select id="getReceiptList" resultType="com.yxproject.start.entity.ReceiptListEntity" parameterType="String"> <select id="getReceiptList" resultType="com.yxproject.start.entity.ReceiptListEntity" parameterType="String">
......
src/main/resources/mapper/SpecialCardMapper.xml
View file @ 4f823c47
...@@ -41,4 +41,16 @@ ...@@ -41,4 +41,16 @@
<select id="addRemainingCard" resultType="com.yxproject.start.entity.SpecialCardEntity" parameterType="String"> <select id="addRemainingCard" resultType="com.yxproject.start.entity.SpecialCardEntity" parameterType="String">
INSERT INTO SPECIAL_CARD (ACCEPT_NO, TASK_ID, SPECIAL_TYPE,GROUP_NO) VALUES (#{accept_Number},(SELECT TASK_ID FROM GROUP_NO WHERE GROUP_NO.GROUP_NO=SUBSTR(#{accept_Number},1,8)),0,SUBSTR(#{accept_Number},1,8)) INSERT INTO SPECIAL_CARD (ACCEPT_NO, TASK_ID, SPECIAL_TYPE,GROUP_NO) VALUES (#{accept_Number},(SELECT TASK_ID FROM GROUP_NO WHERE GROUP_NO.GROUP_NO=SUBSTR(#{accept_Number},1,8)),0,SUBSTR(#{accept_Number},1,8))
</select> </select>
<select id="getProdCard" resultType="java.util.HashMap" parameterType="String">
SELECT NAME,ID_NO,PROD_CARD_T.ACCEPT_NO,SPECIAL_TYPE FROM (select ACCEPT_NO,NAME,ID_NO from prod_card_t@prod_link) PROD_CARD_T
LEFT JOIN (select ACCEPT_NO,SPECIAL_TYPE from SPECIAL_CARD)SPECIAL_CARD ON SPECIAL_CARD.ACCEPT_NO = PROD_CARD_T.ACCEPT_NO
WHERE PROD_CARD_T.ID_NO =#{idNo} OR PROD_CARD_T.ACCEPT_NO =#{acceptNo}
</select>
<select id="getFailedType" resultType="com.yxproject.start.entity.FailedTypeEntity">
SELECT FAILED_CARD_REASON_ID AS failedCardReasonId,FAILED_CARD_REASON AS failedCardReason FROM FAILED_CARD_REASON_DIC
</select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/TaskMapper.xml
View file @ 4f823c47
...@@ -68,8 +68,12 @@ ...@@ -68,8 +68,12 @@
select * from TASK where TASK_STATE_ID =#{task_State_Id} select * from TASK where TASK_STATE_ID =#{task_State_Id}
</select> </select>
<update id="replaceExceptionInformation" parameterType="com.yxproject.start.entity.TaskEntity" > <update id="updateTaskIsException" parameterType="String" >
update TASK set exception_Information = NULL and IS_EXCEPTION =#{is_Exception} where TASK_ID =#{task_Id} update TASK set EXCEPTION_INFORMATION = #{exceptionInformation},IS_EXCEPTION = #{isException} where TASK_ID =#{taskId}
</update>
<update id="replaceExceptionInformation" parameterType="String" >
update TASK set EXCEPTION_INFORMATION = NULL,IS_EXCEPTION = #{isException} where TASK_ID =#{taskId}
</update> </update>
<update id="updateOutStorageDate"> <update id="updateOutStorageDate">
...@@ -91,12 +95,13 @@ ...@@ -91,12 +95,13 @@
GROUP BY CARD_TYPE_DIC.CARD_TYPE,TASK.CARD_TYPE GROUP BY CARD_TYPE_DIC.CARD_TYPE,TASK.CARD_TYPE
</select> </select>
<select id="findCityList" resultType="com.yxproject.start.entity.CityListEntity"> <select id="findCityList" resultType="com.yxproject.start.entity.CityListEntity" parameterType="String">
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 SELECT CARD_TYPE AS cardType,TASK.CITYCODE AS citycode,CITYNAME AS cityName,sum(VALID_COUNT) AS validCount,sum(INVALID_COUNT) AS invalidCount,COUNT(GROUP_NO) AS groupCount,TASK.TASK_ID AS taskId,OLD_CARD_TYPE AS oldCardType,SUBMIT_DATE AS submitDate,ISSUED_DATE AS issuedDate,PRINT_STATE AS printState,DOWNLOAD_DATE AS downloadDate,PRINT_OUT_DATE AS printOutDate,POSITION_DATE AS positionDate,OUT_WORKSHOP_DATE AS outWorkshopDate,QUALITY_PEOPLE_NAME AS qualityPeopleName,QUALITY_TEST_DATE AS qualityTestDate,EXCEPTION_INFORMATION AS exceptionInformation,OUT_STORAGE_DATE AS outStorageDate,IN_STORAGE_DATE AS inStorageDate,TASK_STATE_ID AS taskStateId,IS_EXCEPTION AS isException,PRINTER_ID AS printerId
left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID from TASK
left join (SELECT CITYCODE,CITYNAME FROM CITY_DIC) CITY_DIC on CITY_DIC.CITYCODE = TASK.CITYCODE left join (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 on GROUP_NO.TASK_ID = TASK.TASK_ID
left join (SELECT CITYCODE,CITYNAME FROM CITY_DIC) CITY_DIC on CITY_DIC.CITYCODE = TASK.CITYCODE
where CARD_TYPE=#{cardType} and TASK_STATE_ID = #{taskStateId} 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 GROUP BY CARD_TYPE,TASK.CITYCODE,CITYNAME,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
</select> </select>
......
src/main/resources/mapper/config/mybatis-config.xml
View file @ 4f823c47
...@@ -19,4 +19,10 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN" ...@@ -19,4 +19,10 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
<!--</plugin>--> <!--</plugin>-->
<!--</plugins>--> <!--</plugins>-->
<!--<settings>-->
<!--<setting name="log4jImpl" value="LOG4J"/>-->
<!--</settings>-->
</configuration> </configuration>
\ No newline at end of file
src/main/resources/static/dialogs/specialCardList.html
View file @ 4f823c47
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="specialCard in specialCardList"> <tr ng-repeat="specialCard in specialCardList">
<td>{{specialCard.acceptNo}}</td> <td>{{specialCard.accept_No}}</td>
<td ng-if="specialCard.specialType==0">余证</td> <td ng-if="specialCard.special_Type==0">余证</td>
<td ng-if="specialCard.specialType==1">快证</td> <td ng-if="specialCard.special_Type==1">快证</td>
<td ng-if="specialCard.specialType==2">退证</td> <td ng-if="specialCard.special_Type==2">退证</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/main/resources/static/js/config.router.js
View file @ 4f823c47
...@@ -142,6 +142,18 @@ angular.module('app') ...@@ -142,6 +142,18 @@ angular.module('app')
}] }]
} }
}) })
.state('layout.addFailedCard', {
url: '/addFailedCard',
templateUrl: 'tpl/layout/addFailedCard/addFailedCard.html',
cache:false,
controller:'addFailedCardCtrl',
resolve: {
deps: ['uiLoad',
function( uiLoad ){
return uiLoad.load( ['tpl/layout/addFailedCard/addFailedCard.js'] );
}]
}
})
} }
] ]
......
src/main/resources/static/js/services/service.js
View file @ 4f823c47
...@@ -381,12 +381,13 @@ app.service('MessageService', function (ngDialog) { ...@@ -381,12 +381,13 @@ app.service('MessageService', function (ngDialog) {
MessageService.httpRequestFailed(JSON.stringify(errA)) MessageService.httpRequestFailed(JSON.stringify(errA))
}) })
}, },
getTypeListByTaskStateId:function(state,success){ getTypeListByTaskStateId:function(userState,success){
console.log('----测试查询代码----',userState)
$http({ $http({
method: 'GET', method: 'GET',
url: "../user/getTypeListByTaskStateId" + urlTimeStamp(), url: "../user/getTypeListByTaskStateId" + urlTimeStamp(),
params:{ params:{
taskStateId:state taskStateId:userState
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
...@@ -398,9 +399,9 @@ app.service('MessageService', function (ngDialog) { ...@@ -398,9 +399,9 @@ app.service('MessageService', function (ngDialog) {
getCityListByCardType:function(cardType,state,success){ getCityListByCardType:function(cardType,state,success){
$http({ $http({
method: 'GET', method: 'GET',
url: "../user/getCityListByCardType" + urlTimeStamp(), url: "../user/getCityList" + urlTimeStamp(),
params:{ params:{
state:state, taskStateId:state,
cardType:cardType cardType:cardType
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
...@@ -413,9 +414,9 @@ app.service('MessageService', function (ngDialog) { ...@@ -413,9 +414,9 @@ app.service('MessageService', function (ngDialog) {
getGroupNoByTaskListId:function(taskStateId,success){ getGroupNoByTaskListId:function(taskStateId,success){
$http({ $http({
method: 'GET', method: 'GET',
url: "../user/getGroupNoByTaskListId" + urlTimeStamp(), url: "../user/getGroupListByTaskId" + urlTimeStamp(),
params:{ params:{
taskStateId:taskStateId taskId:taskStateId
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
...@@ -427,9 +428,9 @@ app.service('MessageService', function (ngDialog) { ...@@ -427,9 +428,9 @@ app.service('MessageService', function (ngDialog) {
getCountyListByTaskListId:function(taskStateId,success){ getCountyListByTaskListId:function(taskStateId,success){
$http({ $http({
method: 'GET', method: 'GET',
url: "../user/getCountyListByTaskListId" + urlTimeStamp(), url: "../user/getCountyList" + urlTimeStamp(),
params:{ params:{
taskStateId:taskStateId taskId:taskStateId
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
...@@ -441,7 +442,7 @@ app.service('MessageService', function (ngDialog) { ...@@ -441,7 +442,7 @@ app.service('MessageService', function (ngDialog) {
updateProductionTask:function(taskId,state,success){ updateProductionTask:function(taskId,state,success){
$http({ $http({
method: 'GET', method: 'GET',
url: "../user/updateProductionTask" + urlTimeStamp(), url: "../user/updateTaskState" + urlTimeStamp(),
params:{ params:{
taskId:taskId, taskId:taskId,
state:state state:state
...@@ -471,34 +472,92 @@ app.service('MessageService', function (ngDialog) { ...@@ -471,34 +472,92 @@ app.service('MessageService', function (ngDialog) {
getReceiptData:function(startTime, endTime,success){ getReceiptData:function(startTime, endTime,success){
$http({ $http({
method: 'GET', method: 'GET',
url: "../user/getConnectList" + urlTimeStamp(), url: "../user/getReceiptList" + urlTimeStamp(),
params:{ params:{
startTime:startTime, startDate:startTime,
endTime:endTime endDate:endTime
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response.data,"-------------response.data------")
success(response.data) success(response.data)
},function(err){ },function(err){
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))
}) })
}, },
getprintReceipt:function(startTime, endTime,success){ getFailedType:function(success){
$http({ $http({
method: 'GET', method: 'GET',
url: "../user/getConnectList" + urlTimeStamp(), url: "../user/getFailedType" + urlTimeStamp(),
params:{
startTime:startTime,
endTime:endTime
}
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response.data,"-------------response.data------")
success(response.data) success(response.data)
},function(err){ },function(err){
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))
}) })
} },
saveFailedCardsID:function(success){
$http({
method: 'GET',
url: "../yingxin/addInValidCardInfo" + urlTimeStamp(),
}).then(function successCallback(response) {
console.log(response.data,"-------------response.data------")
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getprintReceipt:function(startDate,endDate,success) {
$http({
method: 'GET',
url: "../user/printReceiptList" + urlTimeStamp(),
params: {
startDate:startDate,
endDate:endDate
},
headers: {'Content-Type': 'application/json'},
transformRequest: angular.identity,
responseType:'arraybuffer',
}).then(function successCallback(response) {
if(response.data.Error == true){
MessageService.httpRequestFailed(JSON.stringify(response.data))
}else{
success(response.data)
}
},function(err){
DebugService.debug("$http error:", err)
DebugService.debug("----------------------------------------------")
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getPrintOfficialReceipt:function(startDate,endDate,success) {
$http({
method: 'GET',
url: "../user/printOfficialReceipt" + urlTimeStamp(),
params: {
startDate:startDate,
endDate:endDate
},
headers: {'Content-Type': 'application/json'},
transformRequest: angular.identity,
responseType:'arraybuffer',
}).then(function successCallback(response) {
if(response.data.Error == true){
MessageService.httpRequestFailed(JSON.stringify(response.data))
}else{
success(response.data)
}
},function(err){
DebugService.debug("$http error:", err)
DebugService.debug("----------------------------------------------")
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/addFailedCard/addFailedCard.html 0 → 100644
View file @ 4f823c47
<!--<div class="row" style="font-size: 1.3em;border-bottom:1px solid #CCCCCC;margin-bottom:10px;padding-top:10px;">-->
<!---->
<!--</div>-->
<!--<div style="padding: 10px;background-color: #fff;border: 1px solid #CCC;border-radius: 10px;">-->
<!---->
<!--</div>-->
<div class="col-md-12">
<p>废证补制</p>
</div>
<div id="cardsDiv">
<form ng-submit="createInputs()">
<span style="font-size:20px;">填写废证数：</span>
<input style="margin-top:20px;height: 30px;" type="text" class="failedcount">
<input type="submit" class="btn btn-primary" value="确定">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
</form>
<form ng-show="showH5==1" ng-submit="saveFailedCards()">
<div style="padding-top:10px;padding-bottom:10px;">请填写废证受理号：</div>
<ul id="cardsUl" style="padding: 0;margin-bottom:10px;">
<li id="0">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failed_Card_Reason_Id}}" ng-repeat="type in failedTypeList">{{type.failed_Card_Reason}}</option>
</select>
</li>
<li id="1">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failed_Card_Reason_Id}}" ng-repeat="type in failedTypeList">{{type.failed_Card_Reason}}</option>
</select>
</li>
<li id="2">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failed_Card_Reason_Id}}" ng-repeat="type in failedTypeList">{{type.failed_Card_Reason}}</option>
</select>
</li>
<li id="3">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failed_Card_Reason_Id}}" ng-repeat="type in failedTypeList">{{type.failed_Card_Reason}}</option>
</select>
</li>
<li id="4">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failed_Card_Reason_Id}}" ng-repeat="type in failedTypeList">{{type.failed_Card_Reason}}</option>
</select>
</li>
<li id="5">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failed_Card_Reason_Id}}" ng-repeat="type in failedTypeList">{{type.failed_Card_Reason}}</option>
</select>
</li>
<li id="6">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failed_Card_Reason_Id}}" ng-repeat="type in failedTypeList">{{type.failed_Card_Reason}}</option>
</select>
</li>
<li id="7">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failed_Card_Reason_Id}}" ng-repeat="type in failedTypeList">{{type.failed_Card_Reason}}</option>
</select>
</li>
<li id="8">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failed_Card_Reason_Id}}" ng-repeat="type in failedTypeList">{{type.failed_Card_Reason}}</option>
</select>
</li>
<li id="9">
身份证号：<input style="height: 30px;" type="text" placeholder="受理号/身份证号"/>
废证类型：
<select style="height: 30px;border-radius: 4px;">
<option value="{{type.failed_Card_Reason_Id}}" ng-repeat="type in failedTypeList">{{type.failed_Card_Reason}}</option>
</select>
</li>
</ul>
<p style="font-size:14px;color: red;text-align: left;" ng-if="alertLb">{{alertLb}}</p>
<div style="text-align: right;">
<input type="submit" class="btn btn-primary" value="保存">
<input type="button" class="btn btn-danger" ng-click="cancelAddFailed()" value="取消">
</div>
</form>
</div>
src/main/resources/static/tpl/layout/addFailedCard/addFailedCard.js 0 → 100644
View file @ 4f823c47
app.controller('addFailedCardCtrl', ['$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.addFailedCard")
}
$scope.failedTypeList =[{failed_Card_Reason_Id:2,failed_Card_Reason:'切废1'},{failed_Card_Reason_Id:1,failed_Card_Reason:"切废"}];
$rootScope.showH5 = 0;
$scope.createInputs = function () {
console.log("---查询废证制证类型---")
HttpService.getFailedType(function(data) {
$scope.failedTypeList = data.respData;
console.log($scope.failedTypeList)
})
for (var i=0;i<10;i++){
document.getElementById(i).style.display = 'none';
document.getElementById(i).style.marginBottom = '10px';
}
$scope.failedCount = $(".failedcount").val();
console.log($scope.failedCount)
if ($scope.failedCount == '' || parseInt($scope.failedCount) <= 0 || parseInt($scope.failedCount) > 10) {
$scope.errMsglb = "数量应在0和10之间且不能为空！";
} else {
$scope.errMsglb = "";
$rootScope.showH5 = 1;
for (var i = 0; i <$scope.failedCount; i++) {
document.getElementById(i).style.display = 'block';
}
}
}
$rootScope.emptyForm = function(){
for (var i = 0; i < $scope.failedCount; i++) {
document.getElementById(i).getElementsByTagName("input")[0].value = "";
document.getElementById(i).getElementsByTagName("input")[1].value = "";
}
}
$scope.saveFailedCards = function () {
$rootScope.arr = [];
var checkArr = [];
var jsonStr = {};
var valueArr = [];
var checkValueArr = [];
for (var i = 0; i < $scope.failedCount; i++) {
var json = {};
var checkJson = {};
json.acceptNo = $('#' + i + ' input:eq(0)').val();
json.reson = $('#' + i + ' select').val();
valueArr.push(json);
if(checkValueArr.indexOf($('#' + i + ' input:eq(0)').val())==-1){
checkValueArr.push($('#' + i + ' input:eq(0)').val());
}
}
if(checkValueArr.length == $scope.failedCount){
checkJson.list = checkValueArr;
jsonStr.list = valueArr;
jsonStr.workshop = $rootScope.loginData.workshop;
$rootScope.arr.push(jsonStr);
checkArr.push(checkJson);
console.log($rootScope.arr)
var myFailedcount = 0;
for (var i = 0; i < $rootScope.arr.length; i++) {
for (var j = 0; j < $rootScope.arr[i].list.length; j++) {
if ($rootScope.arr[i].list[j].acceptNo.length == 18 || $rootScope.arr[i].list[j].acceptNo.length == 10) {
myFailedcount++;
}
else {
continue;
}
}
}
var str = "";
if (myFailedcount == (checkArr.length * valueArr.length)) {
HttpService.remainderCyclesheetInfo(checkArr, function (data) {
console.log(">>>>>>>>>")
console.log(checkArr)
ngDialog.open({
template: 'dialogs/confirmFailedCardsInfo.html' + urlTimeStamp(),
width: '40%',
cache: false,
controller: ['$scope', '$rootScope', 'HttpService', function ($scope, $rootScope, HttpService,MessageService) {
$scope.dataInfo = data.respData;
console.log($scope.dataInfo)
var count = 0;
for(var i=0;i<$scope.dataInfo.length;i++){
if($scope.dataInfo[i][0]!=0){
count+=1;
}else{
continue;
}
}
$scope.isShowSuccess = 0;
$scope.confirmFailedInfo = function () {
console.log($rootScope.arr)
$(".confirmBtn").attr("disabled", true);
if(count==$scope.dataInfo.length){
HttpService.saveFailedCardsID($rootScope.arr,function(data){
$scope.isShowSuccess = 1;
$scope.AddSuccess = data.respData.string;
$rootScope.emptyForm();
})
}else{
$scope.alertError = "请将您输入有误的受理号修改后再添加！";
}
}
$scope.cancelThisDialog = function(){
$rootScope.showH5 = 0;
$scope.closeThisDialog();
}
}]
})
})
} else {
$scope.alertLb = "请检查您输入的废证受理号和身份证号是否全部正确！";
}
}else{
MessageService.showAlert("废证受理号或身份证号存在空值或重复，请检查后再提交。")
}
}
$scope.cancelAddFailed = function () {
$rootScope.showH5 = 0;
$scope.alertLb = "";
$rootScope.emptyForm();
}
}]);
\ No newline at end of file
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.html
View file @ 4f823c47
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</thead> </thead>
<tbody ng-repeat="city in cityList| orderBy:citycode:desc"> <tbody ng-repeat="city in cityList| orderBy:citycode:desc">
<tr> <tr>
<td>{{city.task_Id}}</td> <td>{{city.taskId}}</td>
<td><span class="city" <td><span class="city"
style="color: #337ab7;display:inline-block">{{city.cityName}}</span></td> style="color: #337ab7;display:inline-block">{{city.cityName}}</span></td>
<td>{{city.groupCount}}</td> <td>{{city.groupCount}}</td>
...@@ -70,14 +70,14 @@ ...@@ -70,14 +70,14 @@
<span style="padding-left:10px;" <span style="padding-left:10px;"
ng-show="city.printer_Id==null">未分配</span> ng-show="city.printer_Id==null">未分配</span>
<span style="padding-left:10px;" <span style="padding-left:10px;"
ng-show="city.printer_Id!=null">机器<span>{{city.printer_Id}}</span></span> ng-show="city.printer_Id!=null">机器<span>{{city.printerId}}</span></span>
</td> </td>
<td>{{city.state}}</td> <td>{{city.state}}</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.taskId)">组号列表</a></td>
<td ng-if="userState>4"><a ng-click="showTable(city.task_Id)">区县列表</a></td> <td ng-if="userState>4"><a ng-click="showTableCounty(city.taskId)">区县列表</a></td>
<td><a ng-click="finishClick(city.task_Id,userState)">完成</a></td> <td><a ng-click="finishClick(city.taskId,userState)">完成</a></td>
</tr> </tr>
<tr ng-show="showtable==city.task_Id && userState<=4"> <tr ng-show="showtable==city.taskId && 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">
...@@ -90,9 +90,9 @@ ...@@ -90,9 +90,9 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="group in groupList"> <tr ng-repeat="group in groupList">
<td>{{group.groupNO}}</td> <td>{{group.groupNo}}</td>
<td>{{group.vaildCount}}</td> <td>{{group.validCount}}</td>
<td>{{group.invaildCount}}</td> <td>{{group.invalidCount}}</td>
<td>{{group.specialCardCount}}</td> <td>{{group.specialCardCount}}</td>
<td><a ng-click="showTableGroup(group.specialCardList)">特殊证件列表</a></td> <td><a ng-click="showTableGroup(group.specialCardList)">特殊证件列表</a></td>
</tr> </tr>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</td> </td>
</tr> </tr>
<tr ng-show="showtable==city.task_Id && userState>4"> <tr ng-show="showtableCounty==city.taskId && 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">
......
src/main/resources/static/tpl/layout/receipt/receipt.html
View file @ 4f823c47
...@@ -10,53 +10,67 @@ ...@@ -10,53 +10,67 @@
<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="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()"> <input type="submit" class="btn btn-primary" value="查询" ng-click="myClick()">
</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.countyName}}</td>
<td width="100px">{{county.PTZ}}</td>
<td width="100px">{{county.KZ}}</td>
<td width="100px">{{county.YDKSY}}</td>
<td width="100px">{{county.YDKSP}}</td>
<td width="100px">{{county.YDY}}</td>
<td width="100px">{{county.YDP}}</td>
<td width="100px">{{county.JRZ}}</td>
<td width="100px">{{county.KSP}}</td>
<td width="100px">{{county.KSY}}</td>
<td width="100px">{{county.YJZ}}</td>
<td width="100px">{{county.sum}}</td>
<td width="100px">{{county.boxCount}}</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" 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>
</div> </div>
</div> </div>
<div class="loading"> <!--<div class="loading">-->
<span></span> <!--<span></span>-->
<span></span> <!--<span></span>-->
<span></span> <!--<span></span>-->
<span></span> <!--<span></span>-->
<span></span> <!--<span></span>-->
</div> <!--</div>-->
</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
View file @ 4f823c47
...@@ -30,8 +30,10 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt ...@@ -30,8 +30,10 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt
return currentdate; return currentdate;
} }
$scope.currentDetailDate = getNowFormatDetailDate(); $scope.currentDetailDate = getNowFormatDetailDate();
$scope.nowDataEight = new Date().format("yyyy-MM-dd 08:00") // $scope.nowDataEight = new Date().format("yyyy-MM-dd 08:00");
$scope.nowDate = new Date().format("yyyy-MM-dd hh:mm"); var date = new Date();
$scope.nowDataEight = $filter('date')(date,"yyyy-MM-dd 08:00");
$scope.nowDate = $filter('date')(date,"yyyy-MM-dd hh:mm");
var changeDataFormat = function (date) { var changeDataFormat = function (date) {
var yyyyMMdd = date.split(" ")[0]; var yyyyMMdd = date.split(" ")[0];
...@@ -43,12 +45,11 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt ...@@ -43,12 +45,11 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt
var mm = hhmm.split(":")[1]; var mm = hhmm.split(":")[1];
return yyyy + MM + dd + hh + mm; return yyyy + MM + dd + hh + mm;
} }
$scope.receiptData =[];
var getReceiptData = function (startTime, endTime) { var getReceiptData = function (startTime, endTime) {
HttpService.getReceiptData(startTime, endTime, function (data) { HttpService.getReceiptData(startTime, endTime, function (data) {
$scope.receiptData = data.respData; $scope.receiptData = data.respData;
console.log($scope.receiptData)
}) })
} }
getReceiptData(changeDataFormat($scope.nowDataEight), changeDataFormat($scope.nowDate)) getReceiptData(changeDataFormat($scope.nowDataEight), changeDataFormat($scope.nowDate))
...@@ -65,8 +66,10 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt ...@@ -65,8 +66,10 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt
var date2 = $("#wdate2").val(); var date2 = $("#wdate2").val();
HttpService.getprintReceipt(changeDataFormat(date1), changeDataFormat(date2), function (data) { HttpService.getprintReceipt(changeDataFormat(date1), changeDataFormat(date2), function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"}); var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var fileName = $filter('date')(date,"yyyy年MM月dd日交接单") + ".xls";
var a = document.createElement("a"); var a = document.createElement("a");
document.body.appendChild(a); document.body.appendChild(a);
a.download = fileName;
a.href = URL.createObjectURL(blob); a.href = URL.createObjectURL(blob);
a.click(); a.click();
}) })
...@@ -77,6 +80,7 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt ...@@ -77,6 +80,7 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt
var date2 = $("#wdate2").val(); var date2 = $("#wdate2").val();
HttpService.getPrintOfficialReceipt(changeDataFormat(date1), changeDataFormat(date2), function (data) { HttpService.getPrintOfficialReceipt(changeDataFormat(date1), changeDataFormat(date2), function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"}); var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var fileName = $filter('date')(date,"yyyy年MM月dd日回执单") + ".xls";
var a = document.createElement("a"); var a = document.createElement("a");
document.body.appendChild(a); document.body.appendChild(a);
a.href = URL.createObjectURL(blob); a.href = URL.createObjectURL(blob);
......
src/main/resources/static/tpl/layout/yieldReport/yieldReport.js
View file @ 4f823c47
...@@ -5,7 +5,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$ ...@@ -5,7 +5,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
} else { } else {
$state.go("layout.yieldReport") $state.go("layout.yieldReport")
} }
$scope.userState = $rootScope.loginData.state; $scope.userState = $rootScope.workshop;
// $scope.userState=5; // $scope.userState=5;
...@@ -48,10 +48,10 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$ ...@@ -48,10 +48,10 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
$scope.month_last = getMonthLastDay(); $scope.month_last = getMonthLastDay();
var getQualityReport = function (startDate, endDate) { var getQualityReport = function (startDate, endDate) {
HttpService.getQualityReport(startDate, endDate, function (data) { // HttpService.getQualityReport(startDate, endDate, function (data) {
$scope.dataCheckData = data.respData; // $scope.dataCheckData = data.respData;
console.log("初始化数据核验质量报表：", $scope.dataCheckData) // console.log("初始化数据核验质量报表：", $scope.dataCheckData)
}) // })
} }
//初始化数据核验报表 //初始化数据核验报表
if ($rootScope.loginData.state == 1 || $rootScope.loginData.state == 0) { if ($rootScope.loginData.state == 1 || $rootScope.loginData.state == 0) {
...@@ -89,7 +89,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$ ...@@ -89,7 +89,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
}) })
} }
if ($rootScope.loginData.state == 0) { if ($rootScope.loginData.state == 0) {
HttpService.getAdminPrintData(startDate, endDate, $scope.state.substring(1, 2), function (data) { HttpService.getAdminPrintData(startDate, endDate, $scope.userState, function (data) {
$scope.printDataReport = data.respData; $scope.printDataReport = data.respData;
console.log("初始化打印卸载报表：", $scope.printDataReport) console.log("初始化打印卸载报表：", $scope.printDataReport)
}) })
...@@ -128,23 +128,23 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$ ...@@ -128,23 +128,23 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
} }
var getQualityCheckReport = function (month) { var getQualityCheckReport = function (month) {
if ($rootScope.loginData.state == 6) { // if ($rootScope.loginData.state == 6) {
HttpService.getQualityCheckReportData(month, function (data) { // HttpService.getQualityCheckReportData(month, function (data) {
$scope.qulityCheckData = data.respData; // $scope.qulityCheckData = data.respData;
console.log("质检报表：", $scope.qulityCheckData) // console.log("质检报表：", $scope.qulityCheckData)
}) // })
} // }
if ($rootScope.loginData.state == 0) { // if ($rootScope.loginData.state == 0) {
HttpService.getAdminQualityCheckReportData(month, $scope.state.substring(1, 2), function (data) { // HttpService.getAdminQualityCheckReportData(month, $scope.state.substring(1, 2), function (data) {
$scope.qulityCheckData = data.respData; // $scope.qulityCheckData = data.respData;
console.log("质检报表：", $scope.qulityCheckData) // console.log("质检报表：", $scope.qulityCheckData)
}) // })
} // }
} }
if ($rootScope.loginData.state == 6 || $rootScope.loginData.state == 0) { // if ($rootScope.loginData.state == 6 || $rootScope.loginData.state == 0) {
getQualityCheckReport($scope.nowMonth) // getQualityCheckReport($scope.nowMonth)
} // }
$scope.printQualityCheckReport = function () { $scope.printQualityCheckReport = function () {
var month = $("#wdateZj").val() var month = $("#wdateZj").val()
......
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