|
@@ -17,10 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import java.util.Arrays;
|
|
|
|
-import java.util.Comparator;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Objects;
|
|
|
|
|
|
+import java.util.*;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
import static com.siwei.apply.common.Common.UserId;
|
|
import static com.siwei.apply.common.Common.UserId;
|
|
@@ -114,11 +111,12 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
|
|
String talbeName5 = "t_jsydghxk";//建设用地规划许可
|
|
String talbeName5 = "t_jsydghxk";//建设用地规划许可
|
|
String talbeName6 = "t_jsgcghxk";//建设工程规划许可
|
|
String talbeName6 = "t_jsgcghxk";//建设工程规划许可
|
|
|
|
|
|
- String levyStatusCode = replaceCode;
|
|
|
|
- String landSupplyModeCode = replaceCode;
|
|
|
|
|
|
+ String levyStatusCode = "0";
|
|
|
|
+ String landSupplyModeCode = "W";
|
|
|
|
+
|
|
String approvalProcessCode = replaceCode;
|
|
String approvalProcessCode = replaceCode;
|
|
- String registrationProcessCode = replaceCode;
|
|
|
|
- String licenseStagesCode = replaceCode;
|
|
|
|
|
|
+ String registrationProcessCode = "0";
|
|
|
|
+ String licenseStagesCode = "1";
|
|
|
|
|
|
//单独选址
|
|
//单独选址
|
|
if(ProjectType.ALONE.getCode().equals(String.valueOf(projectType))){
|
|
if(ProjectType.ALONE.getCode().equals(String.valueOf(projectType))){
|
|
@@ -290,6 +288,16 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
|
|
}
|
|
}
|
|
String landCodeId = Objects.nonNull(nodeLand) ? nodeLand.getId() : "";
|
|
String landCodeId = Objects.nonNull(nodeLand) ? nodeLand.getId() : "";
|
|
LandOneCode landOneCode = mapper.getByWorkflowId(projectWorkflowId);
|
|
LandOneCode landOneCode = mapper.getByWorkflowId(projectWorkflowId);
|
|
|
|
+
|
|
|
|
+ String resourceImmobileCode = "360122011009GB00309F";
|
|
|
|
+ Random random = new Random();
|
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
|
+ for (int i = 0; i < 8; i++) {
|
|
|
|
+ sb.append(random.nextInt(10)); // 生成0-9随机数并拼接
|
|
|
|
+ }
|
|
|
|
+ String randomNumber = sb.toString();
|
|
|
|
+ resourceImmobileCode+=randomNumber;
|
|
|
|
+
|
|
if(Objects.nonNull(landOneCode)){ //修改数据
|
|
if(Objects.nonNull(landOneCode)){ //修改数据
|
|
landOneCode.setProjectId(projectId);
|
|
landOneCode.setProjectId(projectId);
|
|
landOneCode.setLandCode(landCodeId);
|
|
landOneCode.setLandCode(landCodeId);
|
|
@@ -297,7 +305,7 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
|
|
String businessCode = this.getBusinessCode( projectWorkflowId, projectType);
|
|
String businessCode = this.getBusinessCode( projectWorkflowId, projectType);
|
|
landOneCode.setResourceBusinessCode(businessCode);
|
|
landOneCode.setResourceBusinessCode(businessCode);
|
|
landOneCode.setResourceProjectCode(project.getCode());
|
|
landOneCode.setResourceProjectCode(project.getCode());
|
|
- landOneCode.setResourceImmobileCode("####");
|
|
|
|
|
|
+ landOneCode.setResourceImmobileCode(resourceImmobileCode);
|
|
mapper.updateById(landOneCode);
|
|
mapper.updateById(landOneCode);
|
|
}else {
|
|
}else {
|
|
//保存入库
|
|
//保存入库
|
|
@@ -309,7 +317,7 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
|
|
String businessCode = this.getBusinessCode( projectWorkflowId, projectType);
|
|
String businessCode = this.getBusinessCode( projectWorkflowId, projectType);
|
|
landOneCode.setResourceBusinessCode(businessCode);
|
|
landOneCode.setResourceBusinessCode(businessCode);
|
|
landOneCode.setResourceProjectCode(project.getCode());
|
|
landOneCode.setResourceProjectCode(project.getCode());
|
|
- landOneCode.setResourceImmobileCode("####");
|
|
|
|
|
|
+ landOneCode.setResourceImmobileCode(resourceImmobileCode);
|
|
mapper.add(landOneCode);
|
|
mapper.add(landOneCode);
|
|
}
|
|
}
|
|
return landOneCode.getId();
|
|
return landOneCode.getId();
|