Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 9f1d53cf authored by ad's avatar ad
Browse files
Options

Merge branch 'dev' of… 

Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev
parents bc7977e2 4827033b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1166 additions and 65 deletions
src/main/java/com/yxproject/start/api/DeliveredApi.java
View file @ 9f1d53cf
package com.yxproject.start.api; package com.yxproject.start.api;
import com.yxproject.start.entity.DeliveredFailedInfoEntity; import com.yxproject.start.entity.*;
import com.yxproject.start.entity.DeliveredImportDicEntity;
import com.yxproject.start.entity.DeliveredInfoEntity;
import com.yxproject.start.service.DeliveredService; import com.yxproject.start.service.DeliveredService;
import com.yxproject.start.service.DetailReceiptListService;
import com.yxproject.start.service.ReceiptService;
import com.yxproject.start.utils.ReadExcel; import com.yxproject.start.utils.ReadExcel;
import com.yxproject.start.utils.YXJSONResponse; import com.yxproject.start.utils.YXJSONResponse;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
...@@ -43,6 +43,11 @@ public class DeliveredApi { ...@@ -43,6 +43,11 @@ public class DeliveredApi {
@Autowired @Autowired
private DeliveredService deliveredService; private DeliveredService deliveredService;
@Autowired
private DetailReceiptListService detailReceiptListService;
@Autowired
private ReceiptService receiptService;
/** /**
* 导入妥投信息表 * 导入妥投信息表
...@@ -68,7 +73,7 @@ public class DeliveredApi { ...@@ -68,7 +73,7 @@ public class DeliveredApi {
try { try {
//将当前上下文初始化给 CommonsMutipartResolver （多部分解析器） //将当前上下文初始化给 CommonsMutipartResolver （多部分解析器）
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver( CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
requ.getSession().getServletContext()); requ.getServletContext());
// 判断是否是多数据段提交格式 // 判断是否是多数据段提交格式
if (multipartResolver.isMultipart(requ)) { if (multipartResolver.isMultipart(requ)) {
MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ; MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;
...@@ -211,6 +216,42 @@ public class DeliveredApi { ...@@ -211,6 +216,42 @@ public class DeliveredApi {
return mapList; return mapList;
} }
/**
* 库房确认接收妥投失败证件
* @param json 妥投失败证件号
* @return
*/
@RequestMapping("acceptDeliveredFailed")
// @RequiresPermissions("userInfo.add")//权限管理;
@Transactional(rollbackFor = Exception.class)
public boolean acceptDeliveredFailed(@RequestBody String json) {
JSONObject jsonObject = JSONObject.fromObject(json);
JSONArray jsonArray = (JSONArray) jsonObject.get("cardIdList");
String name = jsonObject.getString("name")+"";
List<String> list = (List<String>) jsonArray;
for (String cardId:list){
//todo 确认接收妥投失败证件
//查询出对应详单信息
List<DetailReceiptListEntity> detailReceiptListEntityList = detailReceiptListService.selectDetailReceiptListEntityByCardId(cardId);
if (detailReceiptListEntityList.size()>0){
//生成新的交接单信息
ReceiptListEntity receiptListEntity = new ReceiptListEntity();
DetailReceiptListEntity detailReceiptListEntity = detailReceiptListEntityList.get(0);
receiptListEntity.setPoliceCode(detailReceiptListEntity.getUploadNo().substring(0,9));
receiptListEntity.setQrCode(detailReceiptListEntity.getAcceptNo());
receiptListEntity.setFinishCount((long)1);
receiptListEntity.setState((long)1);
receiptListEntity.setCheckName(name);
receiptListEntity.setCardTypeId((long)0);
long id = receiptService.saveReceiptList(receiptListEntity);
//更改对应的详单信息
detailReceiptListService.updateDetailReceiptList(detailReceiptListEntity,id);
}
}
return true;
}
/** /**
* 删除导入妥投信息 * 删除导入妥投信息
...@@ -237,6 +278,16 @@ public class DeliveredApi { ...@@ -237,6 +278,16 @@ public class DeliveredApi {
return deliveredService.deleteDeliveredFailedById(Long.valueOf(id)); return deliveredService.deleteDeliveredFailedById(Long.valueOf(id));
} }
/**
* 查询登记妥投失败类型
* @return 返回值
*/
@RequestMapping("queryDeliveredFailedType")
// @RequiresPermissions("userInfo.add")//权限管理;
public List<DeliveredFailedReasonEntity> queryDeliveredFailedType(){
return deliveredService.selectDeliveredFailedType();
}
/** /**
......
src/main/java/com/yxproject/start/api/ExportExcelApi.java
View file @ 9f1d53cf
...@@ -68,7 +68,7 @@ public class ExportExcelApi { ...@@ -68,7 +68,7 @@ public class ExportExcelApi {
String startDate = jsonObject.get("startDate").toString(); String startDate = jsonObject.get("startDate").toString();
String endDate = jsonObject.get("endDate").toString(); String endDate = jsonObject.get("endDate").toString();
String type = jsonObject.get("type").toString(); String type = jsonObject.get("type").toString();
Map<String, Object> map = receiptService.selectReceiptList(jsonArray, replaceDate(startDate),replaceDate(endDate), Long.valueOf(type)); Map<String, Object> map = receiptService.selectReceiptList(jsonArray, replaceDate(startDate), replaceDate(endDate), Long.valueOf(type));
// response.setContentType("application/x-download"); // response.setContentType("application/x-download");
// response.setCharacterEncoding("UTF-8"); // response.setCharacterEncoding("UTF-8");
// String dateTime = DateFormatUtils.format(new Date(), "yyyy_MM_dd"); // String dateTime = DateFormatUtils.format(new Date(), "yyyy_MM_dd");
...@@ -113,7 +113,7 @@ public class ExportExcelApi { ...@@ -113,7 +113,7 @@ public class ExportExcelApi {
* @return * @return
*/ */
private String replaceDate(String str) { private String replaceDate(String str) {
return str.replace("-", "").replace(" ","").replace(":",""); return str.replace("-", "").replace(" ", "").replace(":", "");
} }
......
src/main/java/com/yxproject/start/api/FailedCardApi.java
View file @ 9f1d53cf
...@@ -85,7 +85,7 @@ public class FailedCardApi { ...@@ -85,7 +85,7 @@ public class FailedCardApi {
idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId")); idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId"));
} }
int initiator = 5; int initiator = 5;
failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"),idMap.get("WORK_GROUP").toString()); failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"), idMap.get("WORK_GROUP").toString());
} }
return true; return true;
} }
...@@ -96,7 +96,6 @@ public class FailedCardApi { ...@@ -96,7 +96,6 @@ public class FailedCardApi {
* @param jsonStr * @param jsonStr
* @return * @return
*/ */
//TODO 多张余证可以生成一张任务单 判断是否是同一个countyCode
@RequestMapping("insertRemaining") @RequestMapping("insertRemaining")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean insertRemaining(@RequestBody String jsonStr) { public Boolean insertRemaining(@RequestBody String jsonStr) {
...@@ -115,10 +114,10 @@ public class FailedCardApi { ...@@ -115,10 +114,10 @@ public class FailedCardApi {
taskEntity.setCardType(cardType); taskEntity.setCardType(cardType);
taskEntity.setTaskStateId((long) 1); taskEntity.setTaskStateId((long) 1);
taskEntity.setSubmitName(name); taskEntity.setSubmitName(name);
if ("null".equals(resultMap.get("WORK_GROUP")+"")){ if ("null".equals(resultMap.get("WORK_GROUP") + "")) {
}else { } else {
taskEntity.setWorkGroup(Long.valueOf(resultMap.get("WORK_GROUP")+"")); taskEntity.setWorkGroup(Long.valueOf(resultMap.get("WORK_GROUP") + ""));
} }
/*特证数+1*/ /*特证数+1*/
failedCardService.specialCardAdd(acceptNo); failedCardService.specialCardAdd(acceptNo);
......
src/main/java/com/yxproject/start/api/PersonPostApi.java
View file @ 9f1d53cf
...@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.transaction.Transactional;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
...@@ -45,6 +46,7 @@ public class PersonPostApi { ...@@ -45,6 +46,7 @@ public class PersonPostApi {
* @return * @return
*/ */
@RequestMapping("selectNote") @RequestMapping("selectNote")
@Transactional
public List<Map<String,Object>>selectNote(@RequestBody String jsonStr){ public List<Map<String,Object>>selectNote(@RequestBody String jsonStr){
List<Map<String,Object>> resultList = new ArrayList<>(); List<Map<String,Object>> resultList = new ArrayList<>();
...@@ -62,6 +64,7 @@ public class PersonPostApi { ...@@ -62,6 +64,7 @@ public class PersonPostApi {
* @return * @return
*/ */
@RequestMapping("addNote") @RequestMapping("addNote")
@Transactional
public boolean addNote(@RequestBody String jsonStr){ public boolean addNote(@RequestBody String jsonStr){
JSONArray jsonArray = JSONArray.fromObject(jsonStr); JSONArray jsonArray = JSONArray.fromObject(jsonStr);
for (int i=0;i<jsonArray.size();i++){ for (int i=0;i<jsonArray.size();i++){
...@@ -78,6 +81,7 @@ public class PersonPostApi { ...@@ -78,6 +81,7 @@ public class PersonPostApi {
* @return * @return
*/ */
@RequestMapping("findPersonalDataCount") @RequestMapping("findPersonalDataCount")
@Transactional
public int findPersonalDataCount(@RequestBody String jsonStr){ public int findPersonalDataCount(@RequestBody String jsonStr){
JSONObject jsonObject = JSONObject.fromObject(jsonStr); JSONObject jsonObject = JSONObject.fromObject(jsonStr);
String applicantName = jsonObject.getString("applicantName"); String applicantName = jsonObject.getString("applicantName");
...@@ -98,6 +102,7 @@ public class PersonPostApi { ...@@ -98,6 +102,7 @@ public class PersonPostApi {
* @return * @return
*/ */
@RequestMapping("findPersonalData") @RequestMapping("findPersonalData")
@Transactional
public List<PersonPostEntity> findPersonalData(@RequestBody String jsonStr){ public List<PersonPostEntity> findPersonalData(@RequestBody String jsonStr){
JSONObject jsonObject = JSONObject.fromObject(jsonStr); JSONObject jsonObject = JSONObject.fromObject(jsonStr);
String applicantName = jsonObject.getString("applicantName"); String applicantName = jsonObject.getString("applicantName");
......
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ 9f1d53cf
...@@ -68,7 +68,7 @@ public class ReadExcelApi { ...@@ -68,7 +68,7 @@ public class ReadExcelApi {
try { try {
//将当前上下文初始化给 CommonsMutipartResolver （多部分解析器） //将当前上下文初始化给 CommonsMutipartResolver （多部分解析器）
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver( CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
requ.getSession().getServletContext()); requ.getServletContext());
// 判断是否是多数据段提交格式 // 判断是否是多数据段提交格式
if (multipartResolver.isMultipart(requ)) { if (multipartResolver.isMultipart(requ)) {
MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ; MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;
......
src/main/java/com/yxproject/start/api/ReadXmlApi.java
View file @ 9f1d53cf
...@@ -66,7 +66,7 @@ public class ReadXmlApi { ...@@ -66,7 +66,7 @@ public class ReadXmlApi {
try { try {
//将当前上下文初始化给 CommonsMutipartResolver （多部分解析器） //将当前上下文初始化给 CommonsMutipartResolver （多部分解析器）
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver( CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
requ.getSession().getServletContext()); requ.getServletContext());
// 判断是否是多数据段提交格式 // 判断是否是多数据段提交格式
if (multipartResolver.isMultipart(requ)) { if (multipartResolver.isMultipart(requ)) {
MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ; MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;
......
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ 9f1d53cf
...@@ -75,7 +75,7 @@ public class TaskListApi { ...@@ -75,7 +75,7 @@ public class TaskListApi {
* taskId 任务单ID * taskId 任务单ID
* name 打印转出人姓名 * name 打印转出人姓名
* process 打印转出人所在工序 * process 打印转出人所在工序
* printer 打印机编号 * failedList 废证任务单
* *
* @return * @return
*/ */
...@@ -90,7 +90,22 @@ public class TaskListApi { ...@@ -90,7 +90,22 @@ public class TaskListApi {
List<String> list = (List<String>) jsonArray; List<String> list = (List<String>) jsonArray;
return taskListService.updateState2(failedList, list, process, name); return taskListService.updateState2(failedList, list, process, name);
} }
/**
* 更改任务单工作组
* （打印转出）
* taskId 任务单ID
* workGroup 工作组
*
* @return
*/
@RequestMapping("updateWorkGroup")
public boolean updateWorkGroup(@RequestBody String json) {
JSONObject jsonObject = JSONObject.fromObject(json);
JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList");
String workGroup = jsonObject.get("workGroup").toString();
List<String> list = (List<String>) jsonArray;
return taskListService.updateWorkGroup(list, workGroup);
}
/** /**
* 查询任务单详情 * 查询任务单详情
......
src/main/java/com/yxproject/start/mapper/DeliveredInfoMapper.java
View file @ 9f1d53cf
package com.yxproject.start.mapper; package com.yxproject.start.mapper;
import com.yxproject.start.entity.DeliveredFailedReasonEntity;
import com.yxproject.start.entity.DeliveredImportDicEntity; import com.yxproject.start.entity.DeliveredImportDicEntity;
import com.yxproject.start.entity.DeliveredInfoEntity; import com.yxproject.start.entity.DeliveredInfoEntity;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
...@@ -45,4 +46,6 @@ public interface DeliveredInfoMapper { ...@@ -45,4 +46,6 @@ public interface DeliveredInfoMapper {
@Delete("delete from DELIVERED_FAILED_INFO where id = #{id}") @Delete("delete from DELIVERED_FAILED_INFO where id = #{id}")
public boolean deleteDeliveredFailedById(@Param("id")long id); public boolean deleteDeliveredFailedById(@Param("id")long id);
@Select("select * from DELIVERED_FAILED_REASON ")
public List<DeliveredFailedReasonEntity> selectDeliveredFailedType();
} }
src/main/java/com/yxproject/start/mapper/DetailReceiptListMapper.java
View file @ 9f1d53cf
package com.yxproject.start.mapper; package com.yxproject.start.mapper;
import com.yxproject.start.entity.DetailReceiptListEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -25,4 +28,18 @@ public interface DetailReceiptListMapper { ...@@ -25,4 +28,18 @@ public interface DetailReceiptListMapper {
"where to_char(RECEIPT_LIST.CHECK_DATE,'yyyyMMdd') =#{date}") "where to_char(RECEIPT_LIST.CHECK_DATE,'yyyyMMdd') =#{date}")
public List<Map<String,Object>> selectPostDetails(String date); public List<Map<String,Object>> selectPostDetails(String date);
/**
* 查询详单信息
* @param cardId 身份证件号码
* @return
*/
@Select("select * from DETAIL_RECEIPT_LIST where CARD_ID = #{cardId} order by id desc")
public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardId);
/**
* 更新详单信息的交接单Id
* @return
*/
@Update("UPDATE DETAIL_RECEIPT_LIST set RECEIPT_ID = #{reciptId} where id =#{id}")
public boolean updateDetailReceiptList(@Param("id")long id, @Param("reciptId")long reciptId);
} }
src/main/java/com/yxproject/start/mapper/InfoManagementMapper.java
View file @ 9f1d53cf
...@@ -26,7 +26,7 @@ public interface InfoManagementMapper { ...@@ -26,7 +26,7 @@ public interface InfoManagementMapper {
") " + ") " +
"A" + "A" +
")" + ")" +
"WHERE RN BETWEEN #{end} AND #{begin}" + "WHERE RN BETWEEN #{begin} AND #{end}" +
"</script>") "</script>")
public List<NewFilesEntity> selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("begin") long begin, @Param("end") long end); public List<NewFilesEntity> selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("begin") long begin, @Param("end") long end);
......
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ 9f1d53cf
...@@ -97,9 +97,9 @@ public interface LogMapper { ...@@ -97,9 +97,9 @@ public interface LogMapper {
" and substr(NEW_FILES.CREATE_DATE,0,8)=#{createDate}" + " and substr(NEW_FILES.CREATE_DATE,0,8)=#{createDate}" +
" </if>" + " </if>" +
" <if test='cardId !=\"\"' >" + " <if test='cardId !=\"\"' >" +
" and PREPRO_PERSON.GMSFHM=#{cardId} ORDER by CREATE_DATE " + " and PREPRO_PERSON.GMSFHM=#{cardId} " +
" </if>" + " </if>" +
" order by CREATE_DATE desc ) " + " ORDER by CREATE_DATE) " +
" A" + " A" +
" )" + " )" +
" WHERE RN BETWEEN #{end} AND #{begin}" + " WHERE RN BETWEEN #{end} AND #{begin}" +
......
src/main/java/com/yxproject/start/mapper/MaterialManagementMapper.java
View file @ 9f1d53cf
...@@ -14,7 +14,7 @@ import java.util.Map; ...@@ -14,7 +14,7 @@ import java.util.Map;
@Mapper @Mapper
public interface MaterialManagementMapper { public interface MaterialManagementMapper {
@Insert("INSERT INTO PLASTIC_FILM (TOTAL_COUNT,PLASTIC_FILM_TYPE,NOTE,name)VALUES(#{totalCount},#{plasticFilmType},#{note},#{name})") @Insert("INSERT INTO PLASTIC_FILM (TOTAL_COUNT,PLASTIC_FILM_TYPE,NOTE,name)VALUES(#{totalCount},#{plasticFilmType},#{note},#{name})")
public boolean insertFilm(@Param("totalCount")String totalCount,@Param("plasticFilmType")String plasticFilmType,@Param("note")String note,@Param("name")String name); public boolean insertFilm(@Param("totalCount") String totalCount, @Param("plasticFilmType") String plasticFilmType, @Param("note") String note, @Param("name") String name);
@Select("<script>" + @Select("<script>" +
"select * from plastic_film where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate}" + "select * from plastic_film where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate}" +
...@@ -22,69 +22,69 @@ public interface MaterialManagementMapper { ...@@ -22,69 +22,69 @@ public interface MaterialManagementMapper {
" and name =#{name} " + " and name =#{name} " +
"</if>" + "</if>" +
"<if test='typeCode != 0 '>" + "<if test='typeCode != 0 '>" +
" and typeCode =#{typeCode} " + " and PLASTIC_FILM_TYPE =#{typeCode} " +
"</if>" + "</if>" +
"</script>") "</script>")
public List<PlasticFilmEntity> selectFilm(@Param("beginDate") String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name); public List<PlasticFilmEntity> selectFilm(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
@Select("<script>" + @Select("<script>" +
"select sum(TOTAL_COUNT) PLASTIC_FILM_TYPE1 from plastic_film where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and PLASTIC_FILM_TYPE=1 "+ "select sum(TOTAL_COUNT) PLASTIC_FILM_TYPE1 from plastic_film where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and PLASTIC_FILM_TYPE=1 " +
"<if test='name != null '>" + "<if test='name != null '>" +
" and name =#{name} " + " and name =#{name} " +
"</if>" + "</if>" +
"<if test='typeCode != 0 '>" + "<if test='typeCode != 0 '>" +
" and typeCode =#{typeCode} " + " and PLASTIC_FILM_TYPE =#{typeCode} " +
"</if>" + "</if>" +
"</script>") "</script>")
public String selectFilmCount1(@Param("beginDate") String beginDate,@Param("endDate")String endDate ,@Param("typeCode")String typeCode,@Param("name")String name); public String selectFilmCount1(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
@Select("<script>" + @Select("<script>" +
"select sum(TOTAL_COUNT) PLASTIC_FILM_TYPE1 from plastic_film where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and PLASTIC_FILM_TYPE=2"+ "select sum(TOTAL_COUNT) PLASTIC_FILM_TYPE1 from plastic_film where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and PLASTIC_FILM_TYPE=2" +
"<if test='name != null '>" + "<if test='name != null '>" +
" and name =#{name} " + " and name =#{name} " +
"</if>" + "</if>" +
"<if test='typeCode != 0 '>" + "<if test='typeCode != 0 '>" +
" and typeCode =#{typeCode} " + " and PLASTIC_FILM_TYPE =#{typeCode} " +
"</if>" + "</if>" +
"</script>") "</script>")
public String selectFilmCount2(@Param("beginDate") String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name); public String selectFilmCount2(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
@Insert("INSERT INTO CARD_BODY (CARD_TYPE,TOTAL_COUNT,NOTE,name)VALUES(#{cardType},#{totalCount},#{note},#{name})") @Insert("INSERT INTO CARD_BODY (CARD_TYPE,TOTAL_COUNT,NOTE,name)VALUES(#{cardType},#{totalCount},#{note},#{name})")
public boolean insertCardBody(@Param("cardType")String cardType,@Param("totalCount")String totalCount,@Param("note")String note,@Param("name")String name); public boolean insertCardBody(@Param("cardType") String cardType, @Param("totalCount") String totalCount, @Param("note") String note, @Param("name") String name);
@Select("<script>" + @Select("<script>" +
"select * from CARD_BODY where to_char(SAVE_DATE,'yyyyMMdd') between #{beginDate} and #{endDate}"+ "select * from CARD_BODY where to_char(SAVE_DATE,'yyyyMMdd') between #{beginDate} and #{endDate}" +
"<if test='name != null '>" + "<if test='name != null '>" +
" and name =#{name} " + " and name =#{name} " +
"</if>" + "</if>" +
"<if test='typeCode != 0 '>" + "<if test='typeCode != 0 '>" +
" and typeCode =#{typeCode} " + " and card_type =#{typeCode} " +
"</if>" + "</if>" +
"</script>") "</script>")
public List<CardBodyEntity> selectCardBody(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name); public List<CardBodyEntity> selectCardBody(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
@Select("<script>" + @Select("<script>" +
"select sum(TOTAL_COUNT) cardType1 from CARD_BODY where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and CARD_TYPE=1"+ "select sum(TOTAL_COUNT) cardType1 from CARD_BODY where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and CARD_TYPE=1" +
"<if test='name != null '>" + "<if test='name != null '>" +
" and name =#{name} " + " and name =#{name} " +
"</if>" + "</if>" +
"<if test='typeCode != 0 '>" + "<if test='typeCode != 0 '>" +
" and typeCode =#{typeCode} " + " and card_type =#{typeCode} " +
"</if>" + "</if>" +
"</script>") "</script>")
public String selectCardCount1(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name); public String selectCardCount1(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
@Select("<script>" + @Select("<script>" +
"select sum(TOTAL_COUNT) cardType2 from CARD_BODY where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and CARD_TYPE=2"+ "select sum(TOTAL_COUNT) cardType2 from CARD_BODY where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and CARD_TYPE=2" +
"<if test='name != null '>" + "<if test='name != null '>" +
" and name =#{name} " + " and name =#{name} " +
"</if>" + "</if>" +
"<if test='typeCode != 0 '>" + "<if test='typeCode != 0 '>" +
" and typeCode =#{typeCode} " + " and card_type =#{typeCode} " +
"</if>" + "</if>" +
"</script>") "</script>")
public String selectCardCount2(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name); public String selectCardCount2(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
} }
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ 9f1d53cf
...@@ -34,7 +34,7 @@ public interface PersonPostMapper { ...@@ -34,7 +34,7 @@ public interface PersonPostMapper {
"SELECT * FROM " + "SELECT * FROM " +
"( " + "( " +
"SELECT A.*, ROWNUM RN " + "SELECT A.*, ROWNUM RN " +
" from (SELECT PERSON_POST.*" + " from (SELECT DISTINCT PERSON_POST.*" +
" FROM PERSON_POST " + " FROM PERSON_POST " +
" LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID " + " LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID " +
" left join PREPRO_PERSON on PERSON_POST.first_white = prepro_person.jmsfzslh " + " left join PREPRO_PERSON on PERSON_POST.first_white = prepro_person.jmsfzslh " +
...@@ -44,14 +44,12 @@ public interface PersonPostMapper { ...@@ -44,14 +44,12 @@ public interface PersonPostMapper {
" <when test='orderNumber!=\"\"'> and PERSON_POST.ORDER_NUMBER=${orderNumber} </when>" + " <when test='orderNumber!=\"\"'> and PERSON_POST.ORDER_NUMBER=${orderNumber} </when>" +
" <if test='state== 0 '> and PERSON_POST.print_date is null </if>" + " <if test='state== 0 '> and PERSON_POST.print_date is null </if>" +
" <if test='state== 1 '> and PERSON_POST.print_date is not null </if>" + " <if test='state== 1 '> and PERSON_POST.print_date is not null </if>" +
// " <if test='notNull== 1 '> and (PERSON_POST.ID_CARD is not null ) or (PERSON_POST.ACCEPT_THE_MATTER is not null ) or (PERSON_POST.BEGIN_USEFUL_LIFE is not null ) or (PERSON_POST.VALID_PERIOD_END is not null ) </if>" +
// " <if test='notNull== 0 '> and (PERSON_POST.ID_CARD is null) or (PERSON_POST.ACCEPT_THE_MATTER is null) or (PERSON_POST.BEGIN_USEFUL_LIFE is null) or (PERSON_POST.VALID_PERIOD_END is null) </if>" +
" <if test='notNull== 1 '> and PREPRO_PERSON.JMSFZSLH is not null </if>" + " <if test='notNull== 1 '> and PREPRO_PERSON.JMSFZSLH is not null </if>" +
" <if test='notNull== 0 '> and PREPRO_PERSON.JMSFZSLH is null </if>" + " <if test='notNull== 0 '> and PREPRO_PERSON.JMSFZSLH is null </if>" +
" <when test='latticeMouthInformation!=\"\"'> and PERSON_POST.LATTICE_MOUTH_INFORMATION=${latticeMouthInformation} </when>" + " <when test='latticeMouthInformation!=\"\"'> and PERSON_POST.LATTICE_MOUTH_INFORMATION=${latticeMouthInformation} </when>" +
" <when test='getToCounty!=null'> and PERSON_POST.GET_TO_COUNTY in ( ${getToCounty} ) </when>" + " <when test='getToCounty!=null'> and PERSON_POST.GET_TO_COUNTY in ( ${getToCounty} ) </when>" +
" <when test='uploadDate!=\"\"'> and subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8)=${uploadDate} </when>" + " <when test='uploadDate!=\"\"'> and subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8)=${uploadDate} </when>" +
") " + "order by PERSON_POST.id ) " +
"A" + "A" +
")" + ")" +
"WHERE RN BETWEEN ${pageSize} AND ${firstIndex}" + "WHERE RN BETWEEN ${pageSize} AND ${firstIndex}" +
...@@ -60,7 +58,7 @@ public interface PersonPostMapper { ...@@ -60,7 +58,7 @@ public interface PersonPostMapper {
@Select("select ID,FIRST_WHITE,APPLICANT_NAME,NOTE from person_post where ID=#{id}") @Select("select ID,FIRST_WHITE,APPLICANT_NAME,NOTE from person_post where ID=#{id}")
public Map<String,Object>selectNote(@Param("id")int id); public List<Map<String,Object>> selectNote(@Param("id")int id);
@Update("UPDATE PERSON_POST SET NOTE = #{note} where ID = #{id}") @Update("UPDATE PERSON_POST SET NOTE = #{note} where ID = #{id}")
......
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ 9f1d53cf
...@@ -59,6 +59,19 @@ public interface ReceiptMapper { ...@@ -59,6 +59,19 @@ public interface ReceiptMapper {
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID") @Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
public long createReceiptList(ReceiptListEntity receiptListEntity); public long createReceiptList(ReceiptListEntity receiptListEntity);
//生成交接单
@Insert("<script>" +
" INSERT INTO RECEIPT_LIST(QR_CODE,POLICE_CODE,FINISH_COUNT,STATE,CARD_TYPE_ID,CHECK_NAME,CHECK_date,RECEIPT_DATE" +
"<if test ='oldCardTypeId !=null'> " +
",OLD_CARD_TYPE_ID" +
"</if> " +
")VALUES(#{qrCode},#{policeCode},#{finishCount},#{state},#{cardTypeId},#{checkName},sysdate,sysdate" +
"<if test ='oldCardTypeId !=null'> " +
",#{oldCardTypeId}" +
"</if> " +
") </script>")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
public long saveReceiptList(ReceiptListEntity receiptListEntity);
//根据身份证号查询交接单详单信息 //根据身份证号查询交接单详单信息
@Select("select prod_card_t.upload_no," + @Select("select prod_card_t.upload_no," +
"PROD_CARD_T.ACCEPT_NO," + "PROD_CARD_T.ACCEPT_NO," +
...@@ -186,7 +199,7 @@ public interface ReceiptMapper { ...@@ -186,7 +199,7 @@ public interface ReceiptMapper {
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID)\n" + "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID)\n" +
"left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" + "left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" +
"left join COUNTY_DIC on substr(RECEIPT_LIST.POLICE_CODE,0,6) = COUNTY_DIC.COUNTY_CODE" + "left join COUNTY_DIC on substr(RECEIPT_LIST.POLICE_CODE,0,6) = COUNTY_DIC.COUNTY_CODE" +
" where to_char(CHECK_DATE,'yyyyMMddhhmmss') BETWEEN ${startDate} and ${endDate} and receipt_date is null ") " where receipt_date is null and to_char(CHECK_DATE,'yyyyMMddhhmmss') BETWEEN ${startDate} and ${endDate} ")
public List<Map<String,Object>> selectReceiptDateByCheckDate(@Param("startDate") String startDate,@Param("endDate") String endDate); public List<Map<String,Object>> selectReceiptDateByCheckDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
...@@ -229,7 +242,7 @@ public interface ReceiptMapper { ...@@ -229,7 +242,7 @@ public interface ReceiptMapper {
@Update("update RECEIPT_LIST set IS_PRINT = 1,RECEIPT_DATE = sysdate where to_char(CHECK_DATE,'yyyyMMddhhmmss') BETWEEN ${startDate} and ${endDate} and RECEIPT_LIST.POLICE_CODE in (${string}) and CARD_TYPE_ID=${type} and receipt_date is null") @Update("update RECEIPT_LIST set IS_PRINT = 1,RECEIPT_DATE = sysdate where to_char(CHECK_DATE,'yyyyMMddhhmmss') BETWEEN ${startDate} and ${endDate} and RECEIPT_LIST.POLICE_CODE in (${string}) and CARD_TYPE_ID=${type} and receipt_date is null")
public boolean updateReceiptDate(@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("string") String string,@Param("type") long type); public boolean updateReceiptDate(@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("string") String string,@Param("type") long type);
@Select("select RECEIPT_LIST.POLICE_CODE,sum(RECEIPT_LIST.FINISH_COUNT),GAJG_DM.GAJG_MC from RECEIPT_LIST \n" + @Select("select RECEIPT_LIST.POLICE_CODE,sum(RECEIPT_LIST.FINISH_COUNT) FINISH_COUNT,GAJG_DM.GAJG_MC from RECEIPT_LIST \n" +
"left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" + "left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" +
"where CHECK_NAME = #{name} and to_char(CHECK_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} \n" + "where CHECK_NAME = #{name} and to_char(CHECK_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} \n" +
"group by RECEIPT_LIST.POLICE_CODE, GAJG_DM.GAJG_MC") "group by RECEIPT_LIST.POLICE_CODE, GAJG_DM.GAJG_MC")
......
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ 9f1d53cf
...@@ -1501,6 +1501,8 @@ public interface TaskListMapper { ...@@ -1501,6 +1501,8 @@ public interface TaskListMapper {
"group by CARD_TYPE, CARD_TYPE_ID, failed_count, PUNCHING_DATE") "group by CARD_TYPE, CARD_TYPE_ID, failed_count, PUNCHING_DATE")
public List<Map<String, Object>> selectWorkGroupReport(@Param("startDate")String startDate,@Param("endDate") String endDate,@Param("workGroup") String workGroup); public List<Map<String, Object>> selectWorkGroupReport(@Param("startDate")String startDate,@Param("endDate") String endDate,@Param("workGroup") String workGroup);
@Update("update task set work_group = ${workGroup} where TASK_ID = ${taskId}")
public boolean updateWorkGroup(@Param("taskId")String taskId,@Param("workGroup") long workGroup);
......
src/main/java/com/yxproject/start/service/DeliveredService.java
View file @ 9f1d53cf
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.DeliveredFailedInfoEntity; import com.yxproject.start.entity.DeliveredFailedInfoEntity;
import com.yxproject.start.entity.DeliveredFailedReasonEntity;
import com.yxproject.start.entity.DeliveredImportDicEntity; import com.yxproject.start.entity.DeliveredImportDicEntity;
import com.yxproject.start.entity.DeliveredInfoEntity; import com.yxproject.start.entity.DeliveredInfoEntity;
...@@ -20,4 +21,5 @@ public interface DeliveredService { ...@@ -20,4 +21,5 @@ public interface DeliveredService {
public List<Map<String,Object>> selectDeliveredFailedByRegisterDate(String date); public List<Map<String,Object>> selectDeliveredFailedByRegisterDate(String date);
public boolean deleteDeliveredByFileId(long filedID); public boolean deleteDeliveredByFileId(long filedID);
public boolean deleteDeliveredFailedById(long id); public boolean deleteDeliveredFailedById(long id);
public List<DeliveredFailedReasonEntity> selectDeliveredFailedType();
} }
src/main/java/com/yxproject/start/service/DetailReceiptListService.java
View file @ 9f1d53cf
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.DetailReceiptListEntity;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -9,4 +11,8 @@ import java.util.Map; ...@@ -9,4 +11,8 @@ import java.util.Map;
*/ */
public interface DetailReceiptListService { public interface DetailReceiptListService {
public List<Map<String,Object>> selectPostDetails(String date); public List<Map<String,Object>> selectPostDetails(String date);
public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardID);
public boolean updateDetailReceiptList(DetailReceiptListEntity detailReceiptListEntity,long reciptId);
} }
src/main/java/com/yxproject/start/service/ReceiptService.java
View file @ 9f1d53cf
...@@ -78,4 +78,6 @@ public interface ReceiptService { ...@@ -78,4 +78,6 @@ public interface ReceiptService {
public List<DetailReceiptListEntity> queryReceipt( String acceptNo); public List<DetailReceiptListEntity> queryReceipt( String acceptNo);
public long saveReceiptList(ReceiptListEntity receiptListEntity);
} }
src/main/java/com/yxproject/start/service/TaskListService.java
View file @ 9f1d53cf
...@@ -100,4 +100,5 @@ public interface TaskListService { ...@@ -100,4 +100,5 @@ public interface TaskListService {
public List<Map<String,Object>> selectWorkGroupReport(String startDate,String endDate,String workGroup); public List<Map<String,Object>> selectWorkGroupReport(String startDate,String endDate,String workGroup);
public boolean updateWorkGroup(List<String> list,String workGroup);
} }
src/main/java/com/yxproject/start/service/impl/DeliveredServiceImpl.java
View file @ 9f1d53cf
package com.yxproject.start.service.impl; package com.yxproject.start.service.impl;
import com.yxproject.start.entity.DeliveredFailedInfoEntity; import com.yxproject.start.entity.DeliveredFailedInfoEntity;
import com.yxproject.start.entity.DeliveredFailedReasonEntity;
import com.yxproject.start.entity.DeliveredImportDicEntity; import com.yxproject.start.entity.DeliveredImportDicEntity;
import com.yxproject.start.entity.DeliveredInfoEntity; import com.yxproject.start.entity.DeliveredInfoEntity;
import com.yxproject.start.mapper.DeliveredFailedInfoMapper; import com.yxproject.start.mapper.DeliveredFailedInfoMapper;
...@@ -79,4 +80,10 @@ public class DeliveredServiceImpl implements DeliveredService { ...@@ -79,4 +80,10 @@ public class DeliveredServiceImpl implements DeliveredService {
public boolean deleteDeliveredFailedById(long id) { public boolean deleteDeliveredFailedById(long id) {
return deliveredInfoMapper.deleteDeliveredFailedById(id); return deliveredInfoMapper.deleteDeliveredFailedById(id);
} }
@Override
public List<DeliveredFailedReasonEntity> selectDeliveredFailedType() {
return deliveredInfoMapper.selectDeliveredFailedType();
}
} }
src/main/java/com/yxproject/start/service/impl/DetailReceiptListServiceImpl.java
View file @ 9f1d53cf
package com.yxproject.start.service.impl; package com.yxproject.start.service.impl;
import com.yxproject.start.entity.DetailReceiptListEntity;
import com.yxproject.start.mapper.DetailReceiptListMapper; import com.yxproject.start.mapper.DetailReceiptListMapper;
import com.yxproject.start.service.DetailReceiptListService; import com.yxproject.start.service.DetailReceiptListService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -21,4 +22,14 @@ public class DetailReceiptListServiceImpl implements DetailReceiptListService { ...@@ -21,4 +22,14 @@ public class DetailReceiptListServiceImpl implements DetailReceiptListService {
public List<Map<String, Object>> selectPostDetails(String date) { public List<Map<String, Object>> selectPostDetails(String date) {
return detailReceiptListMapper.selectPostDetails(date); return detailReceiptListMapper.selectPostDetails(date);
} }
@Override
public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardID) {
return detailReceiptListMapper.selectDetailReceiptListEntityByCardId(cardID);
}
@Override
public boolean updateDetailReceiptList(DetailReceiptListEntity detailReceiptListEntity,long reciptId) {
return detailReceiptListMapper.updateDetailReceiptList(detailReceiptListEntity.getId(),reciptId);
}
} }
src/main/java/com/yxproject/start/service/impl/PersonPostServiceImpl.java
View file @ 9f1d53cf
...@@ -135,8 +135,8 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -135,8 +135,8 @@ public class PersonPostServiceImpl implements PersonPostService {
@Override @Override
public Map<String, Object> selectNote(int id) { public Map<String, Object> selectNote(int id) {
Map<String, Object> resultMap = personPostMapper.selectNote(id); List<Map<String, Object>> maps = personPostMapper.selectNote(id);
return resultMap; return maps.get(0);
} }
@Override @Override
......
src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java
View file @ 9f1d53cf
...@@ -261,6 +261,12 @@ public class ReceiptServiceImpl implements ReceiptService { ...@@ -261,6 +261,12 @@ public class ReceiptServiceImpl implements ReceiptService {
return receiptMapper.queryReceipt(acceptNo); return receiptMapper.queryReceipt(acceptNo);
} }
@Override
public long saveReceiptList(ReceiptListEntity receiptListEntity) {
receiptMapper.saveReceiptList(receiptListEntity);
return receiptListEntity.getId();
}
private List<Map<String, Object>> formateMap(List<Map<String, Object>> maplist) { private List<Map<String, Object>> formateMap(List<Map<String, Object>> maplist) {
Map<String, Object> typeMap = new LinkedHashMap<>(); Map<String, Object> typeMap = new LinkedHashMap<>();
for (Map o : maplist) { for (Map o : maplist) {
......
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @ 9f1d53cf
...@@ -955,6 +955,15 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -955,6 +955,15 @@ public class TaskListServiceImpl implements TaskListService {
return taskListMapper.getPrintOutCount(); return taskListMapper.getPrintOutCount();
} }
@Override
@Transactional
public boolean updateWorkGroup(List<String> list, String workGroup) {
for (String taskId:list){
taskListMapper.updateWorkGroup(taskId,Long.valueOf(workGroup));
}
return true;
}
private String createGroupNo(List<Integer> c, List<Integer> nsList) { private String createGroupNo(List<Integer> c, List<Integer> nsList) {
try { try {
String groupNo = ""; String groupNo = "";
......
src/main/resources/static/index.html
View file @ 9f1d53cf
...@@ -184,5 +184,12 @@ ...@@ -184,5 +184,12 @@
<script src="views/tagPrint/tagPrint.js"></script> <script src="views/tagPrint/tagPrint.js"></script>
<script src="views/addTag/addTag.js"></script> <script src="views/addTag/addTag.js"></script>
<script src="views/autoCheck/autoCheck.js"></script> <script src="views/autoCheck/autoCheck.js"></script>
<script src="views/materialManagement/materialManagement.js"></script>
<script src="views/queryWorkGroupReport/queryWorkGroupReport.js"></script>
<script src="views/querySortingReport/querySortingReport.js"></script>
<script src="views/queryQualityCheckReport/queryQualityCheckReport.js"></script>
<script src="views/ReadDeliveredInfo/ReadDeliveredInfo.js"></script>
<script src="views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.js"></script>
<script src="views/queryDeliveredReport/queryDeliveredReport.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ 9f1d53cf
...@@ -24,9 +24,16 @@ angular.module('AvatarCheck', [ ...@@ -24,9 +24,16 @@ angular.module('AvatarCheck', [
'AvatarCheck.analysisLog', 'AvatarCheck.analysisLog',
'AvatarCheck.packageLog', 'AvatarCheck.packageLog',
'AvatarCheck.tagPrint', 'AvatarCheck.tagPrint',
'AvatarCheck.materialManagement',
'tm.pagination', 'tm.pagination',
'AvatarCheck.addTag', 'AvatarCheck.addTag',
'AvatarCheck.autoCheck' 'AvatarCheck.autoCheck',
'AvatarCheck.queryWorkGroupReport',
'AvatarCheck.querySortingReport',
'AvatarCheck.queryQualityCheckReport',
'AvatarCheck.ReadDeliveredInfo',
'AvatarCheck.saveDeliveredFailedInfo',
'AvatarCheck.queryDeliveredReport'
]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) { ]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
$locationProvider.hashPrefix('!'); $locationProvider.hashPrefix('!');
$routeProvider.otherwise({redirectTo: '/createTaskList'}); $routeProvider.otherwise({redirectTo: '/createTaskList'});
...@@ -155,6 +162,28 @@ angular.module('AvatarCheck', [ ...@@ -155,6 +162,28 @@ angular.module('AvatarCheck', [
if($location.path()=="/autoCheck"){ if($location.path()=="/autoCheck"){
$rootScope.tab = '/autoCheck'; $rootScope.tab = '/autoCheck';
} }
if($location.path()=="/materialManagement"){
$rootScope.tab = '/materialManagement';
}
if($location.path()=="/queryWorkGroupReport"){
$rootScope.tab = '/queryWorkGroupReport';
}
if($location.path()=="/querySortingReport"){
$rootScope.tab = '/querySortingReport';
}
if($location.path()=="/queryQualityCheckReport"){
$rootScope.tab = '/queryQualityCheckReport';
}
if($location.path()=="/ReadDeliveredInfo"){
$rootScope.tab = '/ReadDeliveredInfo';
}
if($location.path()=="/saveDeliveredFailedInfo"){
$rootScope.tab = '/saveDeliveredFailedInfo';
}
if($location.path()=="/queryDeliveredReport"){
$rootScope.tab = '/queryDeliveredReport';
}
......
src/main/resources/static/js/service.js
View file @ 9f1d53cf
...@@ -575,6 +575,18 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -575,6 +575,18 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
updateWorkGroup:function(data,success){
var body = JSON.stringify(data);
console.log("data:",body)
$http({
method: 'POST',
url: "../TaskList/updateWorkGroup",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
},
getFjHistoryTask:function(date,success){ getFjHistoryTask:function(date,success){
console.log(date) console.log(date)
$http({ $http({
...@@ -1009,6 +1021,83 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -1009,6 +1021,83 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
},
queryWorkGroupReport:function (date1,date2,success) {
$http({
method: 'GET',
url: "../ReportApi/queryWorkGroupReport" + urlTimeStamp(),
params:{
startDate: date1,
endDate: date2,
workGroup:$rootScope.loginData.workGroup
}
}).then(function successCallback(response) {
success(response.data)
})
},
querySortingReport:function (date1,date2,name,success) {
$http({
method: 'GET',
url: "../ReportApi/querySortingReport" + urlTimeStamp(),
params:{
startDate: date1,
endDate: date2,
name:name
}
}).then(function successCallback(response) {
success(response.data)
})
},
queryQualityCheckReport:function (date1,date2,success) {
$http({
method: 'GET',
url: "../ReportApi/queryQualityCheckReport" + urlTimeStamp(),
params:{
startDate: date1,
endDate: date2
} }
}).then(function successCallback(response) {
success(response.data)
})
},
ReadDeliveredInfo:function(fd,importName,success){
$http({
method: 'POST',
url: "../DeliveredApi/ReadDeliveredInfo?importName="+importName,
data: fd,
headers: {'Content-Type': undefined},
transformRequest: angular.identity
}).then(function successCallback(response) {
success(response.data)
})
},
saveDeliveredFailedInfo:function (arr,success) {
var body = JSON.stringify(arr);
console.log(body)
$http({
method: 'POST',
url: "../DeliveredApi/saveDeliveredFailedInfo",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
},
queryDeliveredReport:function (date1,date2,success) {
$http({
method: 'GET',
url: "../DeliveredApi/queryDeliveredReport" + urlTimeStamp(),
params:{
startDate: date1,
endDate: date2,
}
}).then(function successCallback(response) {
success(response.data)
})
},
} }
}); });
\ No newline at end of file
src/main/resources/static/views/ReadDeliveredInfo/ReadDeliveredInfo.html 0 → 100644
View file @ 9f1d53cf
<div class="box">
<strong class="box-header">导入妥投信息表</strong>
<div class="box-primary">
<table class="table table-bordered">
<tr>
<td>文件名称</td>
<td><input type="text" ng-model="importName"/></td>
</tr>
<tr>
<td>选择Excel文件：</td>
<td colspan="2">
<input type="file"
id="id_file_photo_for_check"
class="file"
data-show-preview="false"
data-allowed-file-extensions='["XLS","xls","XLSX","xlsx"]'
multiple/>
</td>
<td>
<div style="float: left">
<button class="btn btn-primary" ng-click="ReadDeliveredInfo()">导入</button>
</div>
</td>
</tr>
</table>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/ReadDeliveredInfo/ReadDeliveredInfo.js 0 → 100644
View file @ 9f1d53cf
'use strict';
angular.module("AvatarCheck.ReadDeliveredInfo",['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider){
$routeProvider.when('/ReadDeliveredInfo', {
templateUrl: 'views/ReadDeliveredInfo/ReadDeliveredInfo.html' + urlTimeStamp(),
controller: 'readDeliveredInfoContr',
cache: false
});
}])
.controller('readDeliveredInfoContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
$scope.ReadDeliveredInfo = function () {
var importName = $scope.importName;
var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files;
if(files.length==0){
MessageService.showAlert("请选择上传的文件...")
}else{
for(var i in files){
fd.append('file', files[i]);
}
// var getData = $scope.getPostPackage;
ngDialog.openConfirm({
template: 'dialogs/alert.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.wrongMsg =-1;
$scope.msgText = "上传中，请稍等..."
console.log(fd,importName)
HttpService.ReadDeliveredInfo(fd,importName,function (data) {
console.log(data)
if(data){
$scope.closeThisDialog();
// getData();
MessageService.showAlert("上传成功")
}else{
$scope.wrongMsg = '上传失败';
}
})
}]
});
}
}
})
\ No newline at end of file
src/main/resources/static/views/materialManagement/materialManagement.html 0 → 100644
View file @ 9f1d53cf
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary" >
<div class="box-header">
<strong ng-if="state==2">膜打印数据报表</strong>
<strong ng-if="state==3">耗材管理</strong>
<div class="box-tools pull-right">
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate2" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchReport()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<div ng-if="reportData.length==1">
<h4>暂无数据</h4>
</div>
<div ng-if="reportData.length>1">
<div class="table-responsive mailbox-messages" >
<div class="mailbox-messages">
<table class="table table-hover postTable">
<thead>
<tr>
<th ng-if="2">打印日期</th>
<th ng-if="3">预定位日期</th>
<th>大批证</th>
<th>邮寄证</th>
<th>军人证</th>
<th>快证</th>
<th>废证</th>
</tr>
</thead>
<tbody ng-repeat="item in reportData">
<tr style="background-color: #eee">
<td>{{item.date}}</td>
<td style="color: #3c8dbc">{{item.pu}}</td>
<td>{{item.you}}</td>
<td>{{item.jun}}</td>
<td>{{item.kuai}}</td>
<td>{{item.fei}}</td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.table -->
</div>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div>
<!-- /. box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</div>
</div>
src/main/resources/static/views/materialManagement/materialManagement.js 0 → 100644
View file @ 9f1d53cf
'use strict';
angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/materialManagement', {
templateUrl: 'views/materialManagement/materialManagement.html' + urlTimeStamp(),
controller: 'materialManagementCtrl',
cache: false
});
}])
.controller('materialManagementCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.state = 3;
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.choseDate2 = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.searchReport = function () {
var date1=$('#datepicker1').val();
var date2=$('#datepicker2').val();
if(date1==''){
date1= $filter("date")(new Date(), "yyyy-MM-dd");
}
if(date2==''){
date2= $filter("date")(new Date(), "yyyy-MM-dd");
}
HttpService.getReport(date1,date2,function(data){
$scope.reportData=data;
})
}
$scope.searchReport();
});
\ No newline at end of file
src/main/resources/static/views/queryDeliveredReport/queryDeliveredReport.html 0 → 100644
View file @ 9f1d53cf
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary" >
<div class="box-header">
<!--<strong ng-if="state==2">膜打印数据报表</strong>-->
<strong >妥投信息报表</strong>
<div class="box-tools pull-right">
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="startDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="endDate" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="queryDeliveredReport()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<div ng-if="deliveredReportList.length==0">
<h4>暂无数据</h4>
</div>
<div ng-if="deliveredReportList.length>0">
<div class="table-responsive mailbox-messages" >
<div class="mailbox-messages">
<table class="table table-hover postTable">
<thead>
<tr>
<!--<th ng-if="state==2">打印日期</th>-->
<!--<th ng-if="state==3">预定位日期</th>-->
<!--<th>邮寄证</th>-->
<th>邮寄数量</th>
<th>妥投数量</th>
<th>妥投失败数量</th>
<th>未妥投数量</th>
<th>打印时间</th>
</tr>
</thead>
<tbody ng-repeat="item in deliveredReportList">
<tr style="background-color: #eee">
<td>{{item.POST_COUNT}}</td>
<!--<td style="color: #3c8dbc">{{item.pu}}</td>-->
<td>{{item.DELIVERED_COUNT}}</td>
<td>{{item.DELIVERED_FAILED_COUNT}}</td>
<td>{{item.POST_COUNT-item.DELIVERED_COUNT-item.DELIVERED_FAILED_COUNT}}</td>
<td>{{item.PRINT_DATE}}</td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.table -->
</div>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div>
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/queryDeliveredReport/queryDeliveredReport.js 0 → 100644
View file @ 9f1d53cf
'use strict';
angular.module("AvatarCheck.queryDeliveredReport",['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider){
$routeProvider.when('/queryDeliveredReport', {
templateUrl: 'views/queryDeliveredReport/queryDeliveredReport.html' + urlTimeStamp(),
controller: 'queryDeliveredReportContr',
cache: false
});
}])
.controller('queryDeliveredReportContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.queryDeliveredReport=function () {
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
HttpService.queryDeliveredReport(date1,date2,function (data) {
$scope.deliveredReportList = data;
console.log($scope.deliveredReportList);
})
}
})
\ No newline at end of file
src/main/resources/static/views/queryQualityCheckReport/queryQualityCheckReport.html 0 → 100644
View file @ 9f1d53cf
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary" >
<div class="box-header">
<!--<strong ng-if="state==2">膜打印数据报表</strong>-->
<strong >质检报表</strong>
<div class="box-tools pull-right">
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="startDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="endDate" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="queryQualityCheckReport()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<div ng-if="qualityCheckReportList.length==0">
<h4>暂无数据</h4>
</div>
<div ng-if="qualityCheckReportList.length>0">
<div class="table-responsive mailbox-messages" >
<div class="mailbox-messages">
<table class="table table-hover postTable">
<thead>
<tr>
<!--<th ng-if="state==2">打印日期</th>-->
<!--<th ng-if="state==3">预定位日期</th>-->
<th>分局代码</th>
<th>数量</th>
<th>公安机关名称</th>
<!--<th>普通证</th>-->
<!--<th>废证</th>-->
</tr>
</thead>
<tbody ng-repeat="item in qualityCheckReportList">
<tr style="background-color: #eee">
<td>{{item.DATA_AUDITING.POLICE_SUBSTATION}}</td>
<td>{{item.sum(count)}}</td>
<td>{{item.GAJG_DM.GAJG_MC}}</td>
<!--<td style="color: #3c8dbc">{{item.pu}}</td>-->
<!--<td>{{item.POLICE_CODE}}</td>-->
<!--<td>{{item.SUM(RECEIPT_LIST:FINISH_COUNT)}}</td>-->
<!--<td>{{item.kuai}}</td>-->
<!--<td>{{item.pu}}</td>-->
<!--<td>{{item.fei}}</td>-->
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.table -->
</div>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div>
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/queryQualityCheckReport/queryQualityCheckReport.js 0 → 100644
View file @ 9f1d53cf
'use strict';
angular.module("AvatarCheck.queryQualityCheckReport",['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider){
$routeProvider.when('/queryQualityCheckReport', {
templateUrl: 'views/queryQualityCheckReport/queryQualityCheckReport.html' + urlTimeStamp(),
controller: 'queryQualityCheckReportContro',
cache: false
});
}])
.controller('queryQualityCheckReportContro', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.queryQualityCheckReport=function () {
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
HttpService.queryQualityCheckReport(date1,date2,function (data) {
$scope.qualityCheckReportList = data;
console.log($scope.qualityCheckReportList);
})
}
})
\ No newline at end of file
src/main/resources/static/views/querySortingReport/querySortingReport.html 0 → 100644
View file @ 9f1d53cf
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary" >
<div class="box-header">
<!--<strong ng-if="state==2">膜打印数据报表</strong>-->
<strong >分拣报表</strong>
<div class="box-tools pull-right">
分拣人员姓名:<input type="text" ng-model="name"/>
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="startDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="endDate" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="querySortingReport()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<div ng-if="sortingReportList.length==0">
<h4>暂无数据</h4>
</div>
<div ng-if="sortingReportList.length>0">
<div class="table-responsive mailbox-messages" >
<div class="mailbox-messages">
<table class="table table-hover postTable">
<thead>
<tr>
<!--<th ng-if="state==2">打印日期</th>-->
<!--<th ng-if="state==3">预定位日期</th>-->
<th>公安机关名称</th>
<th>公安机关代码</th>
<th>数量</th>
<!--<th>普通证</th>-->
<!--<th>废证</th>-->
</tr>
</thead>
<tbody ng-repeat="item in sortingReportList">
<tr style="background-color: #eee">
<td>{{item.GAJG_MC}}</td>
<td>{{item.POLICE_CODE}}</td>
<td>{{item.FINISH_COUNT}}</td>
<!--<td style="color: #3c8dbc">{{item.pu}}</td>-->
<!--<td>{{item.POLICE_CODE}}</td>-->
<!--<td>{{item.SUM(RECEIPT_LIST:FINISH_COUNT)}}</td>-->
<!--<td>{{item.kuai}}</td>-->
<!--<td>{{item.pu}}</td>-->
<!--<td>{{item.fei}}</td>-->
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.table -->
</div>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div>
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/querySortingReport/querySortingReport.js 0 → 100644
View file @ 9f1d53cf
'use strict';
angular.module("AvatarCheck.querySortingReport",['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider){
$routeProvider.when('/querySortingReport', {
templateUrl: 'views/querySortingReport/querySortingReport.html' + urlTimeStamp(),
controller: 'querySortingReportContro',
cache: false
});
}])
.controller('querySortingReportContro', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.querySortingReport=function () {
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
var name = $scope.name;
HttpService.querySortingReport(date1,date2,name,function (data) {
$scope.sortingReportList = data;
console.log($scope.sortingReportList);
})
}
})
\ No newline at end of file
src/main/resources/static/views/queryWorkGroupReport/queryWorkGroupReport.html 0 → 100644
View file @ 9f1d53cf
<!--<title>Title</title>-->
<!--<div class="input-group date">-->
<!--<div class="input-group-addon">-->
<!--<i class="fa fa-calendar">开始日期</i>-->
<!--</div>-->
<!--<input type="text" class="form-control pull-right" value="{{startDate}}" id="datepicker1" readonly/>-->
<!--<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>-->
<!--<div class="input-group-addon">-->
<!--<i class="fa fa-calendar">结束日期</i>-->
<!--</div>-->
<!--<input type="text" class="form-control pull-right" value="{{endDate}}" id="datepicker2" readonly/>-->
<!--<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>-->
<!--</div>-->
<!--<button class="btn btn-primary" style="margin-right: 7px;" ng-click="queryWorkGroupReport()">查询工作组报表</button>-->
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary" >
<div class="box-header">
<!--<strong ng-if="state==2">膜打印数据报表</strong>-->
<strong >工作组报表</strong>
<div class="box-tools pull-right">
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="startDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="endDate" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="queryWorkGroupReport()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<div ng-if="groupReportList.length==1">
<h4>暂无数据</h4>
</div>
<div ng-if="groupReportList.length>1">
<div class="table-responsive mailbox-messages" >
<div class="mailbox-messages">
<table class="table table-hover postTable">
<thead>
<tr>
<th ng-if="state==2">打印日期</th>
<!--<th ng-if="state==3">预定位日期</th>-->
<th>邮寄证</th>
<th>军人证</th>
<th>快证</th>
<th>普通证</th>
<th>废证</th>
</tr>
</thead>
<tbody ng-repeat="item in groupReportList">
<tr style="background-color: #eee">
<td>{{item.date}}</td>
<!--<td style="color: #3c8dbc">{{item.pu}}</td>-->
<td>{{item.you}}</td>
<td>{{item.jun}}</td>
<td>{{item.kuai}}</td>
<td>{{item.pu}}</td>
<td>{{item.fei}}</td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.table -->
</div>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div>
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</div>
</div>
src/main/resources/static/views/queryWorkGroupReport/queryWorkGroupReport.js 0 → 100644
View file @ 9f1d53cf
'use strict';
angular.module("AvatarCheck.queryWorkGroupReport",['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider){
$routeProvider.when('/queryWorkGroupReport', {
templateUrl: 'views/queryWorkGroupReport/queryWorkGroupReport.html' + urlTimeStamp(),
controller: 'queryWorkGroupReportContro',
cache: false
});
}])
.controller('queryWorkGroupReportContro', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.queryWorkGroupReport=function () {
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
HttpService.queryWorkGroupReport(date1,date2,function (data) {
$scope.groupReportList = data;
console.log($scope.groupReportList);
})
}
})
src/main/resources/static/views/receitp/receitp.html
View file @ 9f1d53cf
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="divPrint"> <div id="divPrint{{$index}}" ng-repeat="idx in result">
<div class="title" style="text-align: center;"> <div class="title" style="text-align: center;">
北京市公安局证件制作管理中心交接岗位<br /> 北京市公安局证件制作管理中心交接岗位<br />
身份证交接单</div> 身份证交接单</div>
...@@ -156,27 +156,27 @@ ...@@ -156,27 +156,27 @@
<table cellpadding="0" cellspacing="0" border="1" style="text-align: center;"> <table cellpadding="0" cellspacing="0" border="1" style="text-align: center;">
<thead> <thead>
<tr> <tr>
<th width="60"> <th width="60" style="text-align: center;">
序号 序号
</th> </th>
<th width="130"> <th width="130" style="text-align: center;">
身份证受理组号 身份证受理组号
</th> </th>
<th colspan="2"> <th colspan="2" style="text-align: center;">
身份证所属派出所名称 身份证所属派出所名称
</th> </th>
<th width="80"> <th width="80" style="text-align: center;">
数量 数量
</th> </th>
<th width="145"> <th width="145" style="text-align: center;">
备注 备注
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in receitpDataToPrint.list"> <tr ng-repeat="item in idx">
<td width="60"> <td width="60">
{{$index+1}} {{item.id}}
</td> </td>
<td width="130"> <td width="130">
{{item.QR_CODE}} {{item.QR_CODE}}
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
</tr> </tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr ng-if="$index==result.length-1">
<td colspan="2" class="center"> <td colspan="2" class="center">
合计 合计
</td> </td>
......
src/main/resources/static/views/receitp/receitp.js
View file @ 9f1d53cf
...@@ -127,7 +127,8 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -127,7 +127,8 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
endDate:endDate, endDate:endDate,
list:[] list:[]
} }
var checks = $(".checkAllPolice:checked") var checks = $(".checkAllPolice:checked");
for (var i=0;i<checks.length;i++){ for (var i=0;i<checks.length;i++){
for(var j=0;j<JSON.parse(checks[i].value).length;j++){ for(var j=0;j<JSON.parse(checks[i].value).length;j++){
json.list.push(JSON.parse(checks[i].value)[j].POLICE_CODE) json.list.push(JSON.parse(checks[i].value)[j].POLICE_CODE)
...@@ -136,7 +137,16 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -136,7 +137,16 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
console.log(json) console.log(json)
HttpService.printReceitpData(json,function (data) { HttpService.printReceitpData(json,function (data) {
$scope.receitpDataToPrint = data; $scope.receitpDataToPrint = data;
for (var i=0;i<$scope.receitpDataToPrint.list.length;i++){
$scope.receitpDataToPrint.list[i].id = i+1
}
$scope.result = [];
for(var i=0;i<$scope.receitpDataToPrint.list.length;i+=37){
$scope.result.push($scope.receitpDataToPrint.list.slice(i,i+37));
}
console.log($scope.result)
$timeout(function () { $timeout(function () {
for (var i=0;i<$scope.result.length;i++){
var LODOP = getLodop(); var LODOP = getLodop();
LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", ""); LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", "");
//初始化 //初始化
...@@ -158,14 +168,17 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -158,14 +168,17 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.SET_PRINT_STYLEA(0, "Alignment", 1); LODOP.SET_PRINT_STYLEA(0, "Alignment", 1);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 12); LODOP.SET_PRINT_STYLEA(0, "FontSize", 12);
LODOP.ADD_PRINT_TABLE(110, 3, 740, "100%", document.getElementById("divPrint").innerHTML); LODOP.ADD_PRINT_TABLE(110, 3, 740, "100%", document.getElementById("divPrint"+i).innerHTML);
LODOP.SET_PRINT_STYLEA(0, "HOrient", 2); LODOP.SET_PRINT_STYLEA(0, "HOrient", 2);
LODOP.SET_PRINT_STYLEA(0, "Vorient", 3); LODOP.SET_PRINT_STYLEA(0, "Vorient", 3);
LODOP.PREVIEW(); LODOP.SET_PRINTER_INDEXA(-1);
// LODOP.PRINT(); // LODOP.PREVIEW();
LODOP.PRINT();
}
}) })
}) })
} }
}); });
\ No newline at end of file
src/main/resources/static/views/report/report.html
View file @ 9f1d53cf
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="box box-primary" > <div class="box box-primary" >
<div class="box-header"> <div class="box-header">
<strong ng-if="state==2">膜打印数据报表</strong> <strong>膜打印数据报表</strong>
<strong ng-if="state==3">工作组数据报表</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/> <span>至</span> <span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate2" id="datepicker2" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate2" id="datepicker2" readonly/>
...@@ -27,8 +26,7 @@ ...@@ -27,8 +26,7 @@
<table class="table table-hover postTable"> <table class="table table-hover postTable">
<thead> <thead>
<tr> <tr>
<th ng-if="state==2">打印日期</th> <th>打印日期</th>
<th ng-if="state==3">预定位日期</th>
<th>大批证</th> <th>大批证</th>
<th>邮寄证</th> <th>邮寄证</th>
<th>军人证</th> <th>军人证</th>
......
src/main/resources/static/views/report/report.js
View file @ 9f1d53cf
...@@ -10,7 +10,6 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http']) ...@@ -10,7 +10,6 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http'])
}]) }])
.controller('reportCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) { .controller('reportCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.state = 3;
//Date picker //Date picker
$('#datepicker1').datetimepicker({ $('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
...@@ -41,6 +40,7 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http']) ...@@ -41,6 +40,7 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http'])
} }
HttpService.getReport(date1,date2,function(data){ HttpService.getReport(date1,date2,function(data){
$scope.reportData=data; $scope.reportData=data;
console.log($scope.reportData)
}) })
} }
$scope.searchReport(); $scope.searchReport();
......
src/main/resources/static/views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.html 0 → 100644
View file @ 9f1d53cf
<style>
.table th, .table td {
text-align: center;
vertical-align: middle!important;
}
.select2-search__field {
height:30px;
}
.ul li{
cursor: pointer;
}
.page-list .pagination {float:left;}
.page-list .pagination span {cursor: pointer;}
.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
.page-list .pagination .separate span:hover {background: none;}
.page-list .page-total {float:left; margin: 25px 20px;}
.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
.page-list .page-total input {width: 40px; padding-left:3px;}
.page-list .page-total select {width: 50px;}
.page-list:after {
display: block;
clear: both;
content: ""
}
.page-list{
zoom: 1
}
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box ">
<strong class="box-header">登记投递失败信息</strong>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>运单号:</td>
<td><input type="text" class="form-control" ng-model="waybillNumber" placeholder="运单号"></td>
<td>登记人姓名:</td>
<td><input type="text" class="form-control" ng-model="registerName" placeholder="登记人姓名"></td>
<td>身份证号码:</td>
<td><input type="text" class="form-control" ng-model="cardId" placeholder="身份证号码"></td>
</tr>
<tr>
<td>退回原因:</td>
<td><input type="text" class="form-control" ng-model="backReason" placeholder="退回原因"></td>
<td>备注:</td>
<td><input type="text" class="form-control" ng-model="note" placeholder="备注"></td>
<td><div style="text-align: right;">
<button class="btn btn-primary" ng-click="saveDeliveredFailedInfo()">提交</button>
</div></td>
</tr>
</table>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.js 0 → 100644
View file @ 9f1d53cf
'use strict';
angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider){
$routeProvider.when('/saveDeliveredFailedInfo', {
templateUrl: 'views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.html' + urlTimeStamp(),
controller: 'saveDeliveredFailedInfoContr',
cache: false
});
}])
.controller('saveDeliveredFailedInfoContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
$scope.saveDeliveredFailedInfo=function () {
var waybillNumber = $scope.waybillNumber;
var registerName = $scope.registerName;
var cardId = $scope.cardId;
var backReason = $scope.backReason;
var note = $scope.note;
var arr = [{"waybillNumber":waybillNumber,"registerName":registerName,"cardId":cardId,"backReason":backReason,"note":note}];
console.log(arr);
HttpService.saveDeliveredFailedInfo(arr,function (data) {
if(data==true){
confirm("提交成功");
}else{
alert("提交失败!!")
}
})
}
})
\ No newline at end of file
src/main/resources/static/views/task/task.js
View file @ 9f1d53cf
...@@ -176,6 +176,34 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -176,6 +176,34 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
} }
$scope.groupList = [
{
id:1,
name:'A组'
},
{
id:2,
name:'B组'
}
]
$scope.updateGroup = function() {
var groupSelected = $("#groupSelected").val();
console.log(groupSelected)
var checks = $("#checkOneBox:checked");
var arr = [];
for (var i=0;i<checks.length;i++){
arr.push(checks[i].value)
}
var json = {
workGroup:groupSelected,
taskIdList:arr
}
HttpService.updateWorkGroup(json,function(data) {
console.log(data)
$scope.searchTaskList();
})
}
$scope.goes = function(){ $scope.goes = function(){
$rootScope.selectCount = 0; $rootScope.selectCount = 0;
for (var i = 0; i < $scope.selected.length; i++) { for (var i = 0; i < $scope.selected.length; i++) {
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 9f1d53cf
...@@ -100,6 +100,14 @@ ...@@ -100,6 +100,14 @@
</table> </table>
<!-- /.table --> <!-- /.table -->
<div class="box-footer"> <div class="box-footer">
<div class="pull-left">
<select class="form-control select2" id="groupSelected" style="border-radius:5px">
<option value="{{group.id}}" ng-repeat="group in groupList">{{group.name}}</option>
</select>
</div>
<div class="pull-left" style="margin-left: 10px;">
<button class="btn btn-info" ng-click="updateGroup()">更新工作组</button>
</div>
<div class="pull-right" style="margin-left: 10px;"> <div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="goes()">转出任务单</button> <button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div> </div>
......
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