Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 35551c05 authored by dahai's avatar dahai
Browse files
Options

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

parents f39af2e6 cc9c1e5e
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 23 deletions
src/main/java/com/yxproject/start/api/LogApi.java
View file @ 35551c05
......@@ -116,6 +116,7 @@ public class LogApi {
List<Map<String,Object>> resultList = logService.selectFileIdByUploadDate(printDate);
//查询Excel文件信息
Map<String, Object> resultMap = logService.selectFileNameDic(fileId);
logService.changeFileState(fileId);
List<Map<String,Object>> result = new ArrayList<>();
for (int i=0; i<resultList.size();i++){
String fileName=(BigDecimal)(resultList.get(i).get("ID"))+"";
......
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ 35551c05
......@@ -136,7 +136,7 @@ public class ReadExcelApi {
personPostEntity.setLatticeMouthInformation((String) list2.get(19));
personPostEntity.setNatureOfTheInternal((String) list2.get(20));
personPostEntity.setNatureOfTheInformation((String) list2.get(21));
personPostEntity.setFirstWhite(list2.get(22).toString().substring(5,27) );
personPostEntity.setFirstWhite(list2.get(22).toString().substring(5,27 ) );
personPostEntity.setFileId(fileNameDicEntity.getFileId());
entityList.add(personPostEntity);
}
......
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ 35551c05
......@@ -74,7 +74,7 @@ public interface LogMapper {
" ( " +
" SELECT A.*, ROWNUM RN " +
" FROM (SELECT NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC FROM NEW_FILES " +
" LEFT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID" +
" RIGHT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID" +
" where 1=1 " +
" <if test='newFileName !=\"\"' >" +
" and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
......@@ -154,7 +154,13 @@ public interface LogMapper {
public Map<String,Object> selectCountByCardType(@Param("fileId")String fileId);
/**
* 解析时更改Excel文件状态
* @param fileId
* @return
*/
@Update("update FILE_NAME_DIC set STATE = 1 WHERE FILE_ID =#{fileId} ")
public boolean changeFileState(@Param("fileId") String fileId);
......
src/main/java/com/yxproject/start/mapper/SelectSerialNumberMapper.java
View file @ 35551c05
......@@ -12,7 +12,18 @@ import java.util.Map;
@Mapper
public interface SelectSerialNumberMapper {
@Select("select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
@Select("select TASK.TASK_ID," +
"COUNTY_DIC.COUNTYNAME," +
"COUNTY_DIC.COUNTY_CODE," +
"CARD_TYPE_DIC.CARD_TYPE," +
"CARD_TYPE_DIC.CARD_TYPE_ID," +
"TASK.ISSUED_DATE," +
"TASK.PRINT_OUT_DATE," +
"TASK.POSITION_DATE," +
"TASK.CONCORA_CRUSH_DATE, "+
"TASK.PUNCHING_DATE," +
"TASK.SORTING_DATE," +
"TASK.QUALITY_TEST_DATE\n" +
" from TASK \n" +
" LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
" LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
......@@ -20,7 +31,18 @@ public interface SelectSerialNumberMapper {
public List<Map<String,Object>> selectByWorkOrder(String id);
@Select("select GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
@Select("select GROUP_NO.TASK_ID," +
"COUNTY_DIC.COUNTYNAME," +
"COUNTY_DIC.COUNTY_CODE," +
"CARD_TYPE_DIC.CARD_TYPE," +
"CARD_TYPE_DIC.CARD_TYPE_ID," +
"TASK.ISSUED_DATE," +
"TASK.PRINT_OUT_DATE," +
"TASK.POSITION_DATE," +
"TASK.CONCORA_CRUSH_DATE, "+
"TASK.PUNCHING_DATE," +
"TASK.SORTING_DATE," +
"TASK.QUALITY_TEST_DATE\n" +
"from TASK\n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
......@@ -38,9 +60,19 @@ public interface SelectSerialNumberMapper {
public int selectCount(String id);
@Select("select DISTINCT TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,\n" +
"TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,\n" +
"TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
@Select("select DISTINCT " +
"TASK.TASK_ID," +
"COUNTY_DIC.COUNTYNAME," +
"COUNTY_DIC.COUNTY_CODE," +
"CARD_TYPE_DIC.CARD_TYPE," +
"CARD_TYPE_DIC.CARD_TYPE_ID," +
"TASK.ISSUED_DATE," +
"TASK.PRINT_OUT_DATE," +
"TASK.POSITION_DATE," +
"TASK.CONCORA_CRUSH_DATE, "+
"TASK.PUNCHING_DATE," +
"TASK.SORTING_DATE," +
"TASK.QUALITY_TEST_DATE\n" +
"from TASK\n" +
"LEFT JOIN SPECIAL_CARD ON SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
......
src/main/java/com/yxproject/start/service/LogService.java
View file @ 35551c05
......@@ -40,4 +40,6 @@ public interface LogService {
public Map<String,Object> selectCountByCardType(@Param("fileId")String fileName);
public String selectByFileName(@Param("fileName")String fileName);
public boolean changeFileState(@Param("fileId") String fileId);
}
src/main/java/com/yxproject/start/service/impl/LogServiceImpl.java
View file @ 35551c05
......@@ -110,4 +110,10 @@ public class LogServiceImpl implements LogService {
String fileId= logMapper.selectByFileName(fileName);
return fileId;
}
@Override
public boolean changeFileState(String fileId) {
logMapper.changeFileState(fileId);
return false;
}
}
src/main/resources/static/js/service.js
View file @ 35551c05
......@@ -732,13 +732,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
updateIsValidData:function(slh,isValid,success){
console.log(slh,isValid)
updateIsValidData:function(id,isValid,success){
console.log(id,isValid)
$http({
method: 'GET',
url: "../queryPreproPerson/updatePreproPerson"+urlTimeStamp(),
params:{
uploadNo:slh,
id:id,
isValid:isValid
}
}).then(function successCallback(response) {
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ 35551c05
......@@ -111,8 +111,8 @@
<td>{{item.SOURCE_FILE_NAME}}</td>
<td>{{item.NEW_FILE_NAME}}</td>
<td>{{item.CARD_TYPE}}</td>
<td ng-if="item.IS_VALID==1"><button class="btn btn-primary" ng-click="updateIsValid(item.JMSFZSLH,0)">禁用</button></td>
<td ng-if="item.IS_VALID==0"><button class="btn btn-info" ng-click="updateIsValid(item.JMSFZSLH,1)">启用</button></td>
<td ng-if="item.IS_VALID==1"><button class="btn btn-primary" ng-click="updateIsValid(item.ID,0)">禁用</button></td>
<td ng-if="item.IS_VALID==0"><button class="btn btn-info" ng-click="updateIsValid(item.ID,1)">启用</button></td>
</tr>
</tbody>
</table>
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.js
View file @ 35551c05
......@@ -75,8 +75,8 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doPackageQuery);
$scope.updateIsValid = function (slh,isValid) {
HttpService.updateIsValidData(slh,isValid,function(data) {
$scope.updateIsValid = function (id,isValid) {
HttpService.updateIsValidData(id,isValid,function(data) {
$scope.doPackageQuery();
MessageService.showAlert("更新成功")
})
......
src/main/resources/static/views/task/task.js
View file @ 35551c05
......@@ -413,14 +413,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.isHistory=0;
$scope.searchTaskList = function(){
$scope.isHistory=0;
var date=$('#datepicker').val();
if(date==''){
date=$scope.choseDate;
}
HttpService.getHasDistributeCount(date,function (data) {
$scope.distributedCount = data;
console.log(data)
})
HttpService.getFjTaskListByProcess(function(data){
$scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){
......
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