|
@@ -79,7 +79,10 @@ public class PersonWorkServiceImpl implements PersonWorkService {
|
|
|
BigDecimal Hour = new BigDecimal(workingHours);
|
|
|
Hours += Hour.intValue();
|
|
|
String projectId = jobWorkEntry.getProjectId();
|
|
|
-
|
|
|
+ List<Map<String, String>> pros = projectMapper.getProjectManagementInfoBYId(projectId);
|
|
|
+ if (pros.size()<=0){
|
|
|
+ throw new Exception("没有找到项目,请检查");
|
|
|
+ }
|
|
|
String number = SnowflakeUtils.getInstance().getSnowflake().nextIdStr();
|
|
|
|
|
|
Map<String, Object> billMap = new HashMap<>();
|
|
@@ -141,7 +144,7 @@ public class PersonWorkServiceImpl implements PersonWorkService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<Map<String, Object>> getAvailableDateInfoById(String number,String id, String startDate, String endDate) {
|
|
|
+ public List<Map<String, Object>> getAvailableDateInfoById(String number, String id, String startDate, String endDate) {
|
|
|
Map<String,String> person = personService.getPersonByJobNo(number);
|
|
|
List<Map<String,Object>> list = personWorkMapper.getAvailableDateInfoById(person.get("id"),id,startDate,endDate);
|
|
|
for(Map<String,Object> map : list){
|
|
@@ -243,12 +246,75 @@ public class PersonWorkServiceImpl implements PersonWorkService {
|
|
|
map.put("status","2");// 单据id
|
|
|
String str = client.proceedOSF(url,serviceName,map);
|
|
|
if(StrUtil.isNotBlank(str)){
|
|
|
- JSONObject j = JSONUtil.parseObj(str);
|
|
|
- String code = j.getStr("code");
|
|
|
- if("200".equals(code)){
|
|
|
- return 1;
|
|
|
+ try {
|
|
|
+ if(JSONUtil.isTypeJSON(str)) {
|
|
|
+ JSONObject j = JSONUtil.parseObj(str);
|
|
|
+ String code = j.getStr("code");
|
|
|
+ if ("200".equals(code)) {
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+ }catch (Exception e){
|
|
|
+ log.error(e.getMessage(),e);
|
|
|
}
|
|
|
}
|
|
|
return 0;
|
|
|
}
|
|
|
+ @Override
|
|
|
+ @Transactional
|
|
|
+ public Map<String,Object> deleteWorkToMap(String number, String id){
|
|
|
+ int x =personWorkMapper.deleteWorkEntry(id);
|
|
|
+ int i =personWorkMapper.deleteWork(id);
|
|
|
+ Map<String,Object> map = Maps.newHashMap();
|
|
|
+ map.put("code",(i>0?1:0));
|
|
|
+ map.put("work",i);
|
|
|
+ map.put("workEntry",x);
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+ @Override
|
|
|
+ @Transactional
|
|
|
+ public Map<String,Object> submitWorkToMap(String number, String id){
|
|
|
+ OSFWSClient client = new OSFWSClient();
|
|
|
+ Map<String,Object> map = Maps.newHashMap();
|
|
|
+ map.put("billId",id);// 单据id
|
|
|
+ map.put("status","1");// 单据id
|
|
|
+ String str = client.proceedOSF(url,serviceName,map);
|
|
|
+ map.put("code",0);
|
|
|
+ if(StrUtil.isNotBlank(str)){
|
|
|
+ if(JSONUtil.isTypeJSON(str)) {
|
|
|
+ JSONObject j = JSONUtil.parseObj(str);
|
|
|
+ String code = j.getStr("code");
|
|
|
+ if ("200".equals(code)) {
|
|
|
+ map.put("code", 1);
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ map.put("msg", str);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+ @Override
|
|
|
+ @Transactional
|
|
|
+ public Map<String,Object> revocaWorkToMap(String number, String id){
|
|
|
+ OSFWSClient client = new OSFWSClient();
|
|
|
+ Map<String,Object> map = Maps.newHashMap();
|
|
|
+ map.put("billId",id);// 单据id
|
|
|
+ map.put("status","2");// 单据id
|
|
|
+ String str = client.proceedOSF(url,serviceName,map);
|
|
|
+ map.put("code",0);
|
|
|
+ if(StrUtil.isNotBlank(str)) {
|
|
|
+ if (JSONUtil.isTypeJSON(str)) {
|
|
|
+ JSONObject j = JSONUtil.parseObj(str);
|
|
|
+ String code = j.getStr("code");
|
|
|
+ if ("200".equals(code)) {
|
|
|
+ map.put("code", 1);
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ map.put("msg", str);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return map;
|
|
|
+ }
|
|
|
}
|