1、优化查询，便于模糊查询条件2、界面查询条件调整

xiaogang

2023-11-02 62f2b98b64f6726ca7cb90cbfa996deaac4ffba9

 service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java

@@ -25,17 +25,17 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.doc.annotation.*;
import com.java110.dto.itemRelease.ItemReleaseDto;
import com.java110.dto.itemReleaseType.ItemReleaseTypeDto;
import com.java110.dto.itemRelease.ItemReleaseTypeDto;
import com.java110.dto.oaWorkflow.OaWorkflowDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.common.IItemReleaseResV1InnerServiceSMO;
import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO;
import com.java110.intf.common.IItemReleaseV1InnerServiceSMO;
import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO;
import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.itemRelease.ItemReleasePo;
import com.java110.po.itemReleaseRes.ItemReleaseResPo;
import com.java110.po.itemRelease.ItemReleaseResPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -111,7 +111,7 @@
 * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
 */
@Java110Cmd(serviceCode = "itemRelease.saveItemRelease")
@Java110Cmd(serviceCode = "   itemRelease.saveItemRelease")
public class SaveItemReleaseCmd extends Cmd {

    private static Logger logger = LoggerFactory.getLogger(SaveItemReleaseCmd.class);
@@ -134,7 +134,7 @@
    private IUserInnerServiceSMO userInnerServiceSMOImpl;

    @Autowired
    private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
    private IOaWorkflowActivitiInnerServiceSMO oaWorkflowActivitiInnerServiceSMOImpl;


    @Override
@@ -221,6 +221,8 @@
            throw new CmdException("保存数据失败");
        }



        //启动任务
        JSONObject flowJson = new JSONObject();
        flowJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());
@@ -230,7 +232,7 @@
        flowJson.put("auditMessage","提交审核");
        flowJson.put("storeId",itemReleaseTypeDtos.get(0).getStoreId());
        reqJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());
        JSONObject result = oaWorkflowUserInnerServiceSMOImpl.startProcess(flowJson);
        JSONObject result = oaWorkflowActivitiInnerServiceSMOImpl.startProcess(flowJson);

        //提交者提交
        flowJson = new JSONObject();
@@ -242,7 +244,7 @@
        flowJson.put("flowId",oaWorkflowDtos.get(0).getFlowId());


        oaWorkflowUserInnerServiceSMOImpl.autoFinishFirstTask(flowJson);
        oaWorkflowActivitiInnerServiceSMOImpl.autoFinishFirstTask(flowJson);


        cmdDataFlowContext.setResponseEntity(ResultVo.success());