|
|
|
@ -253,7 +253,7 @@ public class AcheckTaskQuartz {
|
|
|
|
|
/**
|
|
|
|
|
* 巡查任务位置 a_safe_xcrwwz
|
|
|
|
|
*/
|
|
|
|
|
saveXcrwwz(b, xcrwwzUuid, xcrwuuid, rwzqUuid);
|
|
|
|
|
saveXcrwwz(b, xcrwwzUuid, xcrwuuid, rwzqUuid, fxdwzResponse);
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 巡查风险点位置隐患 a_safe_yhzgxx
|
|
|
|
@ -347,14 +347,16 @@ public class AcheckTaskQuartz {
|
|
|
|
|
* @param xcrwuuid 巡查任务id
|
|
|
|
|
* @param rwzqUuid 任务周期id
|
|
|
|
|
*/
|
|
|
|
|
private void saveXcrwwz(ACheckQuatzEntity b, String xcrwwzUuid, String xcrwuuid, String rwzqUuid) {
|
|
|
|
|
private void saveXcrwwz(ACheckQuatzEntity b, String xcrwwzUuid, String xcrwuuid, String rwzqUuid, FxdwzResponse fxdwzResponse) {
|
|
|
|
|
ASafeXcrwwz aSafeXcrwwz = new ASafeXcrwwz();
|
|
|
|
|
//xxbh
|
|
|
|
|
aSafeXcrwwz.setXxbh(xcrwwzUuid);
|
|
|
|
|
//任务编号
|
|
|
|
|
aSafeXcrwwz.setRwbh(xcrwuuid);
|
|
|
|
|
//位置编号
|
|
|
|
|
aSafeXcrwwz.setWzbh(null);
|
|
|
|
|
//位置编号 todo
|
|
|
|
|
if (fxdwzResponse != null) {
|
|
|
|
|
aSafeXcrwwz.setWzbh(fxdwzResponse.getWzbh());
|
|
|
|
|
}
|
|
|
|
|
//位置名称
|
|
|
|
|
aSafeXcrwwz.setWzmc(null);
|
|
|
|
|
//周期编号
|
|
|
|
@ -745,7 +747,7 @@ public class AcheckTaskQuartz {
|
|
|
|
|
/**
|
|
|
|
|
* 自查风险点位置隐患 a_safe_yhzgxx
|
|
|
|
|
*/
|
|
|
|
|
saveZihaYhzgxx(list, a, b, yhzgxxUuid, zcrwUuid, rwzqUuid, zcrwUuid);
|
|
|
|
|
saveZihaYhzgxx(list, a, b, yhzgxxUuid, zcrwUuid, rwzqUuid, zcrwUuid, fxdwzResponse);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -988,15 +990,15 @@ public class AcheckTaskQuartz {
|
|
|
|
|
* @param rwzqUuid 任务周期id
|
|
|
|
|
* @param xcrwwzUuid 巡查任务位置id
|
|
|
|
|
*/
|
|
|
|
|
private void saveZihaYhzgxx(List<ACheckQuatzZichaRequest> list, ACheckQuatzZichaRequest a, ACheckQuatzZichaEntity b, String yhzgxxUuid, String zcrwUuid, String rwzqUuid, String xcrwwzUuid) {
|
|
|
|
|
private void saveZihaYhzgxx(List<ACheckQuatzZichaRequest> list, ACheckQuatzZichaRequest a, ACheckQuatzZichaEntity b, String yhzgxxUuid, String zcrwUuid, String rwzqUuid, String xcrwwzUuid, FxdwzResponse fxdwzResponse) {
|
|
|
|
|
ASafeYhzgxx aSafeYhzgxx = new ASafeYhzgxx();
|
|
|
|
|
//信息编号
|
|
|
|
|
aSafeYhzgxx.setXxbh(yhzgxxUuid);
|
|
|
|
|
//任务编号
|
|
|
|
|
aSafeYhzgxx.setRwbh(zcrwUuid);
|
|
|
|
|
//位置编号
|
|
|
|
|
if (b.getWzbh() != null) {
|
|
|
|
|
aSafeYhzgxx.setWzbh(b.getWzbh());
|
|
|
|
|
//位置编号 todo
|
|
|
|
|
if (fxdwzResponse != null) {
|
|
|
|
|
aSafeYhzgxx.setWzbh(fxdwzResponse.getWzbh());
|
|
|
|
|
}
|
|
|
|
|
//企业编号
|
|
|
|
|
aSafeYhzgxx.setQybh(b.getEnterpriseID());
|
|
|
|
|