diff --git a/src/main/java/com/mudu/entity/ACheckQuatzEntity.java b/src/main/java/com/mudu/entity/ACheckQuatzEntity.java index bcaa7ad..37aad06 100644 --- a/src/main/java/com/mudu/entity/ACheckQuatzEntity.java +++ b/src/main/java/com/mudu/entity/ACheckQuatzEntity.java @@ -38,7 +38,11 @@ public class ACheckQuatzEntity { */ @ApiModelProperty(value = "人员编号") private String rybh; - + /** + * a_safe_fxdxxbh + */ + @ApiModelProperty(value = "a_safe_fxdxxbh") + private String fxdxxbh; /** * 整改是否完成(-2专家拒绝,-1是需要专家复查未完成,0未成,1全部完成) */ diff --git a/src/main/java/com/mudu/entity/ACheckQuatzZichaEntity.java b/src/main/java/com/mudu/entity/ACheckQuatzZichaEntity.java index b51a323..b2d59ac 100644 --- a/src/main/java/com/mudu/entity/ACheckQuatzZichaEntity.java +++ b/src/main/java/com/mudu/entity/ACheckQuatzZichaEntity.java @@ -76,6 +76,13 @@ public class ACheckQuatzZichaEntity { @ApiModelProperty(value = "风险点编号") private String fxdbh; + /** + * a_safe_fxdxxbh + */ + @ApiModelProperty(value = "a_safe_fxdxxbh") + private String fxdxxbh; + + /** * 内容 */ diff --git a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java index 872b91d..894d1b2 100644 --- a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java +++ b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java @@ -115,8 +115,8 @@ public class AcheckTaskQuartz { // @ApiOperation(value = "新增创建时间为昨天且处于审批通过的工单数据") public AjaxResult selectAll() throws ParseException { //巡查任务周期id - RwzqUuidResponse rwzqUuidResponse=aSafeRwzqService.getXcUuid(); - String rwzqUuid=rwzqUuidResponse.getXxbh(); + RwzqUuidResponse rwzqUuidResponse = aSafeRwzqService.getXcUuid(); + String rwzqUuid = rwzqUuidResponse.getXxbh(); String responseList = HttpRequest.post(imUrl).contentType("application/x-www-form-urlencoded;charset=UTF-8").execute().body(); JSONObject jsonResponseList = JSON.parseObject(responseList); String dataList = jsonResponseList.getString("data"); @@ -228,7 +228,7 @@ public class AcheckTaskQuartz { //周期编号 aSafeYhzgxx.setZqbh(rwzqUuid); //企业风险点编号 对应a_safe_fxd的信息编号 - aSafeYhzgxx.setQyfxdbh(b.getCheckId()); + aSafeYhzgxx.setQyfxdbh(b.getFxdxxbh()); //隐患来源 aSafeYhzgxx.setYhly("1"); //检查时间 @@ -569,8 +569,8 @@ public class AcheckTaskQuartz { // @ApiOperation(value = "自查") public AjaxResult zicha() throws ParseException { //自己查任务周期id - RwzqUuidResponse rwzqUuidResponse=aSafeRwzqService.getZcUuid(); - String rwzqUuid=rwzqUuidResponse.getXxbh(); + RwzqUuidResponse rwzqUuidResponse = aSafeRwzqService.getZcUuid(); + String rwzqUuid = rwzqUuidResponse.getXxbh(); String responseList = HttpRequest.post(zcXxUrl).contentType("application/x-www-form-urlencoded;charset=UTF-8").execute().body(); JSONObject jsonResponseList = JSON.parseObject(responseList); String dataList = jsonResponseList.getString("data"); @@ -586,7 +586,7 @@ public class AcheckTaskQuartz { /** *新增任务周期a_safe_rwzq */ - saveRwzq(a, rwzqUuid); + // saveRwzq(a, rwzqUuid); /** * 自查任务 a_safe_zcrw */ @@ -694,7 +694,7 @@ public class AcheckTaskQuartz { //任务编号 aSafeZcrwjl.setRwbh(zcrwUuid); //企业风险点编号 - aSafeZcrwjl.setQyfxdbh(b.getCheckId()); + aSafeZcrwjl.setQyfxdbh(b.getFxdxxbh()); //企业风险点位置编号 aSafeZcrwjl.setQyfxdwzbh(b.getFxbh()); //是否发现隐患 @@ -878,7 +878,7 @@ public class AcheckTaskQuartz { //周期编号 aSafeYhzgxx.setZqbh(rwzqUuid); //企业风险点编号 对应a_safe_fxd的信息编号 - aSafeYhzgxx.setQyfxdbh(b.getCheckId()); + aSafeYhzgxx.setQyfxdbh(b.getFxdxxbh()); //隐患来源 aSafeYhzgxx.setYhly("2"); //检查时间