|
@@ -9,6 +9,7 @@ import com.huimv.manage.eartag.service.IEarmarkService;
|
|
import com.huimv.manage.util.*;
|
|
import com.huimv.manage.util.*;
|
|
import com.huimv.manage.webservice.Soap;
|
|
import com.huimv.manage.webservice.Soap;
|
|
import com.huimv.manage.webservice.task.EarmarkTask;
|
|
import com.huimv.manage.webservice.task.EarmarkTask;
|
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.data.domain.Example;
|
|
import org.springframework.data.domain.Example;
|
|
@@ -35,6 +36,7 @@ import java.util.*;
|
|
* @Create : 2020-12-25
|
|
* @Create : 2020-12-25
|
|
**/
|
|
**/
|
|
@Service
|
|
@Service
|
|
|
|
+@Slf4j
|
|
public class EarmarkServiceImpl implements IEarmarkService {
|
|
public class EarmarkServiceImpl implements IEarmarkService {
|
|
@Value("${webservice.url}")
|
|
@Value("${webservice.url}")
|
|
private String webServiceUrl;
|
|
private String webServiceUrl;
|
|
@@ -192,7 +194,8 @@ public class EarmarkServiceImpl implements IEarmarkService {
|
|
if (optional.isPresent()){
|
|
if (optional.isPresent()){
|
|
EtEarmarkEntity earmarkEntity1 = (EtEarmarkEntity) optional.get();
|
|
EtEarmarkEntity earmarkEntity1 = (EtEarmarkEntity) optional.get();
|
|
earmarkEntity1.setSetDownState(1);
|
|
earmarkEntity1.setSetDownState(1);
|
|
- earmarkEntity1.setSetDownDate(new Timestamp(new Date().getTime()));
|
|
|
|
|
|
+// earmarkEntity1.setSetDownDate(new Timestamp(new Date().getTime()));
|
|
|
|
+ earmarkEntity1.setSetDownDate(new Timestamp(System.currentTimeMillis()));
|
|
earmarkRepo.saveAndFlush(earmarkEntity1);
|
|
earmarkRepo.saveAndFlush(earmarkEntity1);
|
|
}else{
|
|
}else{
|
|
return new Result(Const.CODE_NO_RECORD,Const.NO_RECORD,false);
|
|
return new Result(Const.CODE_NO_RECORD,Const.NO_RECORD,false);
|
|
@@ -265,7 +268,8 @@ public class EarmarkServiceImpl implements IEarmarkService {
|
|
Optional optional = earmarkRepo.findById(Integer.parseInt(idArray[a]));
|
|
Optional optional = earmarkRepo.findById(Integer.parseInt(idArray[a]));
|
|
EtEarmarkEntity earmarkEntity = (EtEarmarkEntity) optional.get();
|
|
EtEarmarkEntity earmarkEntity = (EtEarmarkEntity) optional.get();
|
|
earmarkEntity.setSetPrintState(state);
|
|
earmarkEntity.setSetPrintState(state);
|
|
- earmarkEntity.setSetPrintDate(new Timestamp(new Date().getTime()));
|
|
|
|
|
|
+// earmarkEntity.setSetPrintDate(new Timestamp(new Date().getTime()));
|
|
|
|
+ earmarkEntity.setSetPrintDate(new Timestamp(System.currentTimeMillis()));
|
|
earmarkRepo.saveAndFlush(earmarkEntity);
|
|
earmarkRepo.saveAndFlush(earmarkEntity);
|
|
}
|
|
}
|
|
return new Result(ResultCode.SUCCESS);
|
|
return new Result(ResultCode.SUCCESS);
|
|
@@ -322,6 +326,7 @@ public class EarmarkServiceImpl implements IEarmarkService {
|
|
};
|
|
};
|
|
//
|
|
//
|
|
List<EtEarmarkEntity> dataList = earmarkRepo.findAll(specific);
|
|
List<EtEarmarkEntity> dataList = earmarkRepo.findAll(specific);
|
|
|
|
+ log.info("导出数据数量:"+dataList.size());
|
|
//
|
|
//
|
|
excelUtil.exportEarmarkExcel(response,Const.EXPORT_EARMARK_EXCEL,String.valueOf(applyId),dataList,quantity);
|
|
excelUtil.exportEarmarkExcel(response,Const.EXPORT_EARMARK_EXCEL,String.valueOf(applyId),dataList,quantity);
|
|
// test
|
|
// test
|