1

src/main/java/com/sooka/sponest/lawenforcement/record/service/impl/LawenforcementRecordServiceImpl.java

@@ -5,14 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.RemoteConfigService;
-import com.ruoyi.system.api.RemoteDeptService;
 import com.sooka.sponest.lawenforcement.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.lawenforcement.device.service.IDeviceService;
 import com.sooka.sponest.lawenforcement.feign.service.RemoteEnforcementConfigService;
-import com.sooka.sponest.lawenforcement.feign.service.RemoteEnforcementDeptService;
 import com.sooka.sponest.lawenforcement.person.domain.LawenforcementPerson;
 import com.sooka.sponest.lawenforcement.person.mapper.LawenforcementPersonMapper;
 import com.sooka.sponest.lawenforcement.record.domain.LawenforcementRecord;
@@ -25,7 +21,6 @@ import com.sooka.sponest.lawenforcement.record.domain.vo.LawenforcementStandardD
 import com.sooka.sponest.lawenforcement.record.domain.vo.LawenforcementSubitemDetailVO;
 import com.sooka.sponest.lawenforcement.record.mapper.LawenforcementRecordMapper;
 import com.sooka.sponest.lawenforcement.record.service.ILawenforcementRecordService;
-import com.sooka.sponest.lawenforcement.record.setter.RecordIdSetter;
 import com.sooka.sponest.lawenforcement.user.domain.LawenforcementUser;
 import com.sooka.sponest.lawenforcement.user.mapper.LawenforcementUserMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -286,7 +281,7 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
         bo.setCreateBy(SecurityUtils.getUserId().toString());
         bo.setCreateName(SecurityUtils.getUsername());
         bo.setCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        recordMapper.updateRecordState(bo.getRecordId(), "2");
+        recordMapper.updateRecordState(bo.getRecordId(), bo.getType().equals("0") ? "3" : "4");
         return recordMapper.recordFillForm(bo);
     }
 
@@ -483,4 +478,16 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
     public List<Map<String, Object>> getJsonDataMessageByPage(int pageNum, int pageSize) {
         return recordMapper.getJsonDataMessageByPage(pageNum, pageSize);
     }
+
+    @Override
+    public LawenforcementFillFormBO getFillForm(LawenforcementFillFormBO fillFormBO) {
+        LawenforcementFillFormBO fillForm = recordMapper.getFillForm(fillFormBO);
+        if (fillForm!=null) {
+            StringBuilder newDiles = new StringBuilder();
+            String filename = fillForm.getAttachName();
+            newDiles.append(fillForm.getAttachPath()).append("+").append(filename);
+            fillForm.setAttachPath(newDiles.toString());
+        }
+        return fillForm;
+    }
 }